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/01/03 03:20:40 UTC
[6/9] james-project git commit: JAMES-2270 Replace uses of
considered-deprecated constants
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
index 40b72a9..34dbd0a 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java
@@ -26,6 +26,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.core.IsNull.nullValue;
+import java.nio.charset.StandardCharsets;
import java.time.ZonedDateTime;
import org.apache.http.client.utils.URIBuilder;
@@ -43,7 +44,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.base.Charsets;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
@@ -81,7 +81,7 @@ public abstract class GetVacationResponseTest {
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(jmapGuiceProbe.getJmapPort())
.build();
@@ -99,7 +99,7 @@ public abstract class GetVacationResponseTest {
.setHost("localhost")
.setPort(jmapServer.getProbe(JmapGuiceProbe.class)
.getJmapPort())
- .setCharset(Charsets.UTF_8);
+ .setCharset(StandardCharsets.UTF_8);
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
index 832d899..7172833 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java
@@ -38,6 +38,8 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.collection.IsMapWithSize.aMapWithSize;
+import java.nio.charset.StandardCharsets;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.utils.URIBuilder;
import org.apache.james.GuiceJamesServer;
@@ -61,7 +63,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.jayway.restassured.RestAssured;
@@ -101,7 +102,7 @@ public abstract class SetMailboxesMethodTest {
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();
@@ -122,7 +123,7 @@ public abstract class SetMailboxesMethodTest {
.setHost("localhost")
.setPort(jmapServer.getProbe(JmapGuiceProbe.class)
.getJmapPort())
- .setCharset(Charsets.UTF_8);
+ .setCharset(StandardCharsets.UTF_8);
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
index 4b40022..93a7da5 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java
@@ -41,6 +41,7 @@ import static org.hamcrest.collection.IsMapWithSize.anEmptyMap;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
@@ -93,7 +94,6 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.io.ByteStreams;
@@ -153,7 +153,7 @@ public abstract class SetMessagesMethodTest {
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();
@@ -182,7 +182,7 @@ public abstract class SetMessagesMethodTest {
.setHost("localhost")
.setPort(jmapServer.getProbe(JmapGuiceProbe.class)
.getJmapPort())
- .setCharset(Charsets.UTF_8);
+ .setCharset(StandardCharsets.UTF_8);
}
@After
@@ -293,7 +293,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
given()
@@ -316,7 +316,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
// When
@@ -347,13 +347,13 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message1 = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
ComposedMessageId message3 = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String missingMessageId = randomMessageId().serialize();
@@ -384,13 +384,13 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message1 = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
ComposedMessageId message2 = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test2\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
ComposedMessageId message3 = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test3\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
// When
@@ -424,7 +424,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -446,7 +446,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String messageId = message.getMessageId().serialize();
@@ -469,7 +469,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -501,7 +501,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -537,7 +537,7 @@ public abstract class SetMessagesMethodTest {
.add(FORWARDED)
.build();
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, flags);
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, flags);
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -568,7 +568,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.ANSWERED));
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.ANSWERED));
await();
String messageId = message.getMessageId().serialize();
@@ -591,7 +591,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.ANSWERED));
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.ANSWERED));
await();
String messageId = message.getMessageId().serialize();
@@ -614,7 +614,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.DELETED));
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.DELETED));
await();
String messageId = message.getMessageId().serialize();
@@ -647,7 +647,7 @@ public abstract class SetMessagesMethodTest {
.add(Flag.DELETED, Flag.RECENT)
.build();
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, flags);
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, flags);
await();
String messageId = message.getMessageId().serialize();
@@ -682,7 +682,7 @@ public abstract class SetMessagesMethodTest {
.add(Flag.DRAFT, Flag.ANSWERED)
.build();
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, currentFlags);
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, currentFlags);
await();
String messageId = message.getMessageId().serialize();
@@ -726,7 +726,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -755,7 +755,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.SEEN));
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.SEEN));
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -777,7 +777,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.SEEN));
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags(Flags.Flag.SEEN));
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -806,7 +806,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -828,7 +828,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -854,7 +854,7 @@ public abstract class SetMessagesMethodTest {
public void setMessagesShouldRejectUpdateWhenPropertyHasWrongType() throws MailboxException {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
@@ -882,7 +882,7 @@ public abstract class SetMessagesMethodTest {
public void setMessagesShouldRejectUpdateWhenPropertiesHaveWrongTypes() throws MailboxException {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
@@ -911,7 +911,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -933,7 +933,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -961,7 +961,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -981,7 +981,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String serializedMessageId = message.getMessageId().serialize();
@@ -1873,7 +1873,7 @@ public abstract class SetMessagesMethodTest {
String messageCreationId = "creationId1337";
String fromAddress = USERNAME;
Attachment attachment = Attachment.builder()
- .bytes("attachment".getBytes(Charsets.UTF_8))
+ .bytes("attachment".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment);
@@ -1916,7 +1916,7 @@ public abstract class SetMessagesMethodTest {
public void setMessagesShouldNotAllowDraftCreationInSomeoneElseMailbox() throws Exception {
String messageCreationId = "creationId1337";
Attachment attachment = Attachment.builder()
- .bytes("attachment".getBytes(Charsets.UTF_8))
+ .bytes("attachment".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment);
@@ -1954,7 +1954,7 @@ public abstract class SetMessagesMethodTest {
public void setMessagesShouldNotAllowDraftCreationInADelegatedMailbox() throws Exception {
String messageCreationId = "creationId1337";
Attachment attachment = Attachment.builder()
- .bytes("attachment".getBytes(Charsets.UTF_8))
+ .bytes("attachment".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment);
@@ -2107,7 +2107,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldRejectMovingMessageToOutboxWhenNotInDraft() throws MailboxException {
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String messageId = message.getMessageId().serialize();
@@ -3065,7 +3065,7 @@ public abstract class SetMessagesMethodTest {
public void mailboxIdsShouldReturnUpdatedWhenNoChange() throws Exception {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
String messageToMoveId = message.getMessageId().serialize();
String mailboxId = message.getMailboxId().serialize();
@@ -3098,7 +3098,7 @@ public abstract class SetMessagesMethodTest {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
String messageToMoveId = message.getMessageId().serialize();
String requestBody = "[" +
@@ -3142,7 +3142,7 @@ public abstract class SetMessagesMethodTest {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
String messageToMoveId = message.getMessageId().serialize();
String requestBody = "[" +
@@ -3184,7 +3184,7 @@ public abstract class SetMessagesMethodTest {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
String messageToMoveId = message.getMessageId().serialize();
String inboxId = message.getMailboxId().serialize();
@@ -3227,7 +3227,7 @@ public abstract class SetMessagesMethodTest {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
String messageToMoveId = message.getMessageId().serialize();
String inboxId = message.getMailboxId().serialize();
@@ -3267,7 +3267,7 @@ public abstract class SetMessagesMethodTest {
public void mailboxIdsShouldBeInOriginalMailboxWhenNoChange() throws Exception {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
String messageToMoveId = message.getMessageId().serialize();
String mailboxId = message.getMailboxId().serialize();
@@ -3307,7 +3307,7 @@ public abstract class SetMessagesMethodTest {
public void mailboxIdsShouldReturnErrorWhenMovingToADeletedMailbox() throws Exception {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "any");
String mailboxId = mailboxProbe.getMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "any")
@@ -3346,7 +3346,7 @@ public abstract class SetMessagesMethodTest {
public void mailboxIdsShouldReturnErrorWhenSetToEmpty() throws Exception {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
String messageToMoveId = message.getMessageId().serialize();
String requestBody = "[" +
@@ -3384,7 +3384,7 @@ public abstract class SetMessagesMethodTest {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
String messageToMoveId = message.getMessageId().serialize();
String requestBody = "[" +
@@ -3417,7 +3417,7 @@ public abstract class SetMessagesMethodTest {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
String messageToMoveId = message.getMessageId().serialize();
String requestBody = "[" +
@@ -3460,7 +3460,7 @@ public abstract class SetMessagesMethodTest {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
String messageToMoveId = message.getMessageId().serialize();
String requestBody = "[" +
@@ -3496,7 +3496,7 @@ public abstract class SetMessagesMethodTest {
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, MailboxPath.forUser(USERNAME, MailboxConstants.INBOX),
- new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
+ new ByteArrayInputStream("Subject: my test subject\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), Date.from(dateTime.toInstant()), false, new Flags());
String messageToMoveId = message.getMessageId().serialize();
String mailboxId = message.getMailboxId().serialize();
@@ -3577,12 +3577,12 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldReturnAttachmentsWhenMessageHasAttachment() throws Exception {
Attachment attachment = Attachment.builder()
- .bytes("attachment".getBytes(Charsets.UTF_8))
+ .bytes("attachment".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment);
Attachment attachment2 = Attachment.builder()
- .bytes("attachment2".getBytes(Charsets.UTF_8))
+ .bytes("attachment2".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment2);
@@ -3646,17 +3646,17 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldReturnAttachmentsWithNonASCIINames() throws Exception {
Attachment attachment = Attachment.builder()
- .bytes("attachment".getBytes(Charsets.UTF_8))
+ .bytes("attachment".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment);
Attachment attachment2 = Attachment.builder()
- .bytes("attachment2".getBytes(Charsets.UTF_8))
+ .bytes("attachment2".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment2);
Attachment attachment3 = Attachment.builder()
- .bytes("attachment3".getBytes(Charsets.UTF_8))
+ .bytes("attachment3".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment3);
@@ -3732,19 +3732,19 @@ public abstract class SetMessagesMethodTest {
@Test
public void filenamesAttachmentsWithNonASCIICharactersShouldBeRetrievedWhenChainingSetMessagesAndGetMessages() throws Exception {
Attachment attachment = Attachment.builder()
- .bytes("attachment".getBytes(Charsets.UTF_8))
+ .bytes("attachment".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment);
Attachment attachment2 = Attachment.builder()
- .bytes("attachment2".getBytes(Charsets.UTF_8))
+ .bytes("attachment2".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment2);
Attachment attachment3 = Attachment.builder()
- .bytes("attachment3".getBytes(Charsets.UTF_8))
+ .bytes("attachment3".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment3);
@@ -3847,7 +3847,7 @@ public abstract class SetMessagesMethodTest {
with()
.header("Authorization", accessToken.serialize())
.contentType(attachment.getType())
- .content(new String(IOUtils.toByteArray(attachment.getStream()), Charsets.UTF_8))
+ .content(new String(IOUtils.toByteArray(attachment.getStream()), StandardCharsets.UTF_8))
.post("/upload");
}
@@ -4025,7 +4025,7 @@ public abstract class SetMessagesMethodTest {
Attachment attachment = Attachment.builder()
.bytes(("<html>\n" +
" <body>attachment</body>\n" + // needed indentation, else restassured is adding some
- "</html>").getBytes(Charsets.UTF_8))
+ "</html>").getBytes(StandardCharsets.UTF_8))
.type("text/html; charset=UTF-8")
.build();
uploadTextAttachment(attachment);
@@ -4099,7 +4099,7 @@ public abstract class SetMessagesMethodTest {
Attachment attachment = Attachment.builder()
.bytes(("<html>\n" +
" <body>attachment</body>\n" + // needed indentation, else restassured is adding some
- "</html>").getBytes(Charsets.UTF_8))
+ "</html>").getBytes(StandardCharsets.UTF_8))
.type("text/html; charset=UTF-8")
.build();
uploadTextAttachment(attachment);
@@ -4169,7 +4169,7 @@ public abstract class SetMessagesMethodTest {
@Test
public void attachmentAndEmptyBodyShouldBeRetrievedWhenChainingSetMessagesAndGetMessagesWithTextAttachmentWithoutMailBody() throws Exception {
Attachment attachment = Attachment.builder()
- .bytes(("some text").getBytes(Charsets.UTF_8))
+ .bytes(("some text").getBytes(StandardCharsets.UTF_8))
.type("text/plain; charset=UTF-8")
.build();
uploadTextAttachment(attachment);
@@ -4756,12 +4756,12 @@ public abstract class SetMessagesMethodTest {
@Test
public void setMessagesShouldReturnAttachmentsWhenMessageHasInlinedAttachmentButNoCid() throws Exception {
Attachment attachment = Attachment.builder()
- .bytes("attachment".getBytes(Charsets.UTF_8))
+ .bytes("attachment".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment);
Attachment attachment2 = Attachment.builder()
- .bytes("attachment2".getBytes(Charsets.UTF_8))
+ .bytes("attachment2".getBytes(StandardCharsets.UTF_8))
.type("application/octet-stream")
.build();
uploadAttachment(attachment2);
@@ -4826,7 +4826,7 @@ public abstract class SetMessagesMethodTest {
mailboxProbe.createMailbox(MailboxConstants.USER_NAMESPACE, USERNAME, "mailbox");
ComposedMessageId message = mailboxProbe.appendMessage(USERNAME, USER_MAILBOX,
- new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(Charsets.UTF_8)), new Date(), false, new Flags());
+ new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes(StandardCharsets.UTF_8)), new Date(), false, new Flags());
await();
String messageId = message.getMessageId().serialize();
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
index 2c88e54..27cc151 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java
@@ -25,6 +25,7 @@ import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.equalTo;
+import java.nio.charset.StandardCharsets;
import java.time.ZonedDateTime;
import java.util.Optional;
@@ -42,7 +43,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.base.Charsets;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
@@ -72,7 +72,7 @@ public abstract class SetVacationResponseTest {
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(jmapGuiceProbe
.getJmapPort())
.build();
@@ -90,7 +90,7 @@ public abstract class SetVacationResponseTest {
.setHost("localhost")
.setPort(jmapServer.getProbe(JmapGuiceProbe.class)
.getJmapPort())
- .setCharset(Charsets.UTF_8);
+ .setCharset(StandardCharsets.UTF_8);
}
@After
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
index b475e60..f6ece8d 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
@@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -47,7 +48,6 @@ import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mime4j.codec.DecoderUtil;
import com.google.common.base.CharMatcher;
-import com.google.common.base.Charsets;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ArrayListMultimap;
@@ -395,7 +395,7 @@ public class DownloadStepdefs {
@Then("^(?:he|she|the user) can read that blob")
public void httpOkStatusAndExpectedContent() throws IOException {
assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
- assertThat(IOUtils.toString(response.getEntity().getContent(), Charsets.UTF_8)).isNotEmpty();
+ assertThat(IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8)).isNotEmpty();
}
@Then("^the user should receive a not found response$")
@@ -412,7 +412,7 @@ public class DownloadStepdefs {
public void accessTokenResponse() throws Throwable {
assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
assertThat(response.getHeaders("Content-Type")).extracting(Header::toString).containsExactly("Content-Type: text/plain");
- assertThat(IOUtils.toString(response.getEntity().getContent(), Charsets.UTF_8)).isNotEmpty();
+ assertThat(IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8)).isNotEmpty();
}
@Then("^\"([^\"]*)\" should receive an attachment access token$")
@@ -448,6 +448,6 @@ public class DownloadStepdefs {
}
private String decode(String name) {
- return DecoderUtil.decodeEncodedWords(name, Charsets.UTF_8);
+ return DecoderUtil.decodeEncodedWords(name, StandardCharsets.UTF_8);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
index 755b3ff..7752295 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/GetMessagesMethodStepdefs.java
@@ -22,6 +22,7 @@ package org.apache.james.jmap.methods.integration.cucumber;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
@@ -47,7 +48,6 @@ import org.javatuples.Pair;
import com.github.fge.lambdas.Throwing;
import com.github.steveash.guavate.Guavate;
-import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
@@ -172,7 +172,7 @@ public class GetMessagesMethodStepdefs {
try {
return mainStepdefs.mailboxProbe.appendMessage(userStepdefs.getConnectedUser(),
MailboxPath.forUser(userStepdefs.getConnectedUser(), mailbox),
- new ByteArrayInputStream(message(contentType, subject, content, headers).getBytes(Charsets.UTF_8)),
+ new ByteArrayInputStream(message(contentType, subject, content, headers).getBytes(StandardCharsets.UTF_8)),
Date.from(dateTime.toInstant()), false, new Flags()).getMessageId();
} finally {
mainStepdefs.awaitMethod.run();
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
index d862a53..b6d75ec 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/MainStepdefs.java
@@ -19,6 +19,7 @@
package org.apache.james.jmap.methods.integration.cucumber;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.List;
import java.util.stream.Stream;
@@ -38,7 +39,6 @@ import org.apache.james.utils.JmapGuiceProbe;
import org.apache.james.utils.MessageIdProbe;
import com.github.steveash.guavate.Guavate;
-import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
@@ -69,7 +69,7 @@ public class MainStepdefs {
.setScheme("http")
.setHost("localhost")
.setPort(jmapServer.getProbe(JmapGuiceProbe.class).getJmapPort())
- .setCharset(Charsets.UTF_8);
+ .setCharset(StandardCharsets.UTF_8);
}
public void tearDown() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
index 0422ba0..59c6681 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UploadStepdefs.java
@@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.io.BufferedInputStream;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.util.Locale;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Future;
@@ -42,7 +43,6 @@ import org.apache.james.util.CountDownConsumeInputStream;
import org.apache.james.util.ZeroedInputStream;
import com.google.common.base.CharMatcher;
-import com.google.common.base.Charsets;
import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.JsonPath;
@@ -123,7 +123,7 @@ public class UploadStepdefs {
public void userUploadContentWithoutContentType(String username) throws Throwable {
AccessToken accessToken = userStepdefs.authenticate(username);
Request request = Request.Post(uploadUri)
- .bodyByteArray("some text".getBytes(Charsets.UTF_8));
+ .bodyByteArray("some text".getBytes(StandardCharsets.UTF_8));
if (accessToken != null) {
request.addHeader("Authorization", accessToken.serialize());
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
index 6414473..d81f0be 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/UserStepdefs.java
@@ -19,6 +19,7 @@
package org.apache.james.jmap.methods.integration.cucumber;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -33,7 +34,6 @@ import org.apache.james.jmap.api.access.AccessToken;
import com.github.fge.lambdas.Throwing;
import com.github.fge.lambdas.runnable.ThrowingRunnable;
-import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
import com.google.common.hash.Hashing;
@@ -128,6 +128,6 @@ public class UserStepdefs {
}
private String generatePassword(String username) {
- return Hashing.murmur3_128().hashString(username, Charsets.UTF_8).toString();
+ return Hashing.murmur3_128().hashString(username, StandardCharsets.UTF_8).toString();
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
index 5c4d338..ce821fe 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/JMAPServletTest.java
@@ -26,6 +26,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.nio.charset.StandardCharsets;
import java.util.stream.Stream;
import org.apache.james.http.jetty.Configuration;
@@ -43,7 +44,6 @@ import org.junit.Test;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Charsets;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
@@ -70,7 +70,7 @@ public class JMAPServletTest {
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(server.getPort())
.build();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
index e79878b..5e1c537 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
import java.util.Locale;
@@ -73,7 +74,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import com.github.steveash.guavate.Guavate;
-import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -176,11 +176,11 @@ public class GetMessagesMethodTest {
public void processShouldFetchMessages() throws MailboxException {
MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
Date now = new Date();
- ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, false, null);
- ByteArrayInputStream message2Content = new ByteArrayInputStream("Subject: message 2 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message2Content = new ByteArrayInputStream("Subject: message 2 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message2 = inbox.appendMessage(message2Content, now, session, false, null);
- ByteArrayInputStream message3Content = new ByteArrayInputStream("Great-Header: message 3 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message3Content = new ByteArrayInputStream("Great-Header: message 3 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message3 = inbox.appendMessage(message3Content, now, session, false, null);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -210,7 +210,7 @@ public class GetMessagesMethodTest {
ByteArrayInputStream messageContent = new ByteArrayInputStream(("Content-Type: text/html\r\n"
+ "Subject: message 1 subject\r\n"
+ "\r\n"
- + "my <b>HTML</b> message").getBytes(Charsets.UTF_8));
+ + "my <b>HTML</b> message").getBytes(StandardCharsets.UTF_8));
ComposedMessageId message = inbox.appendMessage(messageContent, now, session, false, null);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -232,7 +232,7 @@ public class GetMessagesMethodTest {
public void processShouldReturnOnlyMandatoryPropertiesOnEmptyPropertyList() throws MailboxException {
MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
Date now = new Date();
- ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, false, null);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -251,7 +251,7 @@ public class GetMessagesMethodTest {
public void processShouldReturnAllPropertiesWhenNoPropertyGiven() throws MailboxException {
MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
Date now = new Date();
- ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, false, null);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -268,7 +268,7 @@ public class GetMessagesMethodTest {
public void processShouldAddMandatoryPropertiesWhenNotInPropertyList() throws MailboxException {
MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
Date now = new Date();
- ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, false, null);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -288,7 +288,7 @@ public class GetMessagesMethodTest {
public void processShouldReturnTextBodyWhenBodyInPropertyListAndEmptyHtmlBody() throws MailboxException {
MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
Date now = new Date();
- ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, false, null);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -312,7 +312,7 @@ public class GetMessagesMethodTest {
ByteArrayInputStream messageContent = new ByteArrayInputStream(("Content-Type: text/html\r\n"
+ "Subject: message 1 subject\r\n"
+ "\r\n"
- + "my <b>HTML</b> message").getBytes(Charsets.UTF_8));
+ + "my <b>HTML</b> message").getBytes(StandardCharsets.UTF_8));
ComposedMessageId message = inbox.appendMessage(messageContent, now, session, false, null);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -336,7 +336,7 @@ public class GetMessagesMethodTest {
Date now = new Date();
ByteArrayInputStream messageContent = new ByteArrayInputStream(("Content-Type: text/html\r\n"
+ "Subject: message 1 subject\r\n"
- + "\r\n").getBytes(Charsets.UTF_8));
+ + "\r\n").getBytes(StandardCharsets.UTF_8));
ComposedMessageId message = inbox.appendMessage(messageContent, now, session, false, null);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -373,7 +373,7 @@ public class GetMessagesMethodTest {
+ "Content-Transfer-Encoding: 7bit\n"
+ "\n"
+ "<a>The </a> <strong>HTML</strong> message"
- ).getBytes(Charsets.UTF_8));
+ ).getBytes(StandardCharsets.UTF_8));
ComposedMessageId message = inbox.appendMessage(messageContent, now, session, false, null);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -398,7 +398,7 @@ public class GetMessagesMethodTest {
ByteArrayInputStream message1Content = new ByteArrayInputStream(("From: user@domain.tld\r\n"
+ "header1: Header1Content\r\n"
+ "HEADer2: Header2Content\r\n"
- + "Subject: message 1 subject\r\n\r\nmy message").getBytes(Charsets.UTF_8));
+ + "Subject: message 1 subject\r\n\r\nmy message").getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, false, null);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -422,7 +422,7 @@ public class GetMessagesMethodTest {
ByteArrayInputStream message1Content = new ByteArrayInputStream(("From: user@domain.tld\r\n"
+ "header1: Header1Content\r\n"
+ "HEADer2: Header2Content\r\n"
- + "Subject: message 1 subject\r\n\r\nmy message").getBytes(Charsets.UTF_8));
+ + "Subject: message 1 subject\r\n\r\nmy message").getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, false, null);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -450,7 +450,7 @@ public class GetMessagesMethodTest {
ByteArrayInputStream message1Content = new ByteArrayInputStream(("From: user@domain.tld\r\n"
+ "header1: Header1Content\r\n"
+ "HEADer2: Header2Content\r\n"
- + "Subject: message 1 subject\r\n\r\nmy message").getBytes(Charsets.UTF_8));
+ + "Subject: message 1 subject\r\n\r\nmy message").getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, false, null);
MailboxId customMailboxId = mailboxManager.getMailbox(customMailboxPath, session).getId();
@@ -482,7 +482,7 @@ public class GetMessagesMethodTest {
ByteArrayInputStream message1Content = new ByteArrayInputStream(("From: user@domain.tld\r\n"
+ "header1: Header1Content\r\n"
+ "HEADer2: Header2Content\r\n"
- + "Subject: message 1 subject\r\n\r\nmy message").getBytes(Charsets.UTF_8));
+ + "Subject: message 1 subject\r\n\r\nmy message").getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, NOT_RECENT, FLAGS);
ComposedMessageId message2 = inbox.appendMessage(message1Content, now, session, NOT_RECENT, FLAGS);
when(messageFactory.fromMetaDataWithContent(any()))
@@ -510,11 +510,11 @@ public class GetMessagesMethodTest {
.build();
MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
Date now = new Date();
- ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, false, flags);
- ByteArrayInputStream message2Content = new ByteArrayInputStream("Subject: message 2 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message2Content = new ByteArrayInputStream("Subject: message 2 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message2 = inbox.appendMessage(message2Content, now, session, false, flags);
- ByteArrayInputStream message3Content = new ByteArrayInputStream("Great-Header: message 3 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message3Content = new ByteArrayInputStream("Great-Header: message 3 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message3 = inbox.appendMessage(message3Content, now, session, false, flags);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -559,11 +559,11 @@ public class GetMessagesMethodTest {
.build();
MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
Date now = new Date();
- ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, false, flags1);
- ByteArrayInputStream message2Content = new ByteArrayInputStream("Subject: message 2 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message2Content = new ByteArrayInputStream("Subject: message 2 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message2 = inbox.appendMessage(message2Content, now, session, false, flags2);
- ByteArrayInputStream message3Content = new ByteArrayInputStream("Great-Header: message 3 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message3Content = new ByteArrayInputStream("Great-Header: message 3 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message3 = inbox.appendMessage(message3Content, now, session, false, flags3);
GetMessagesRequest request = GetMessagesRequest.builder()
@@ -602,7 +602,7 @@ public class GetMessagesMethodTest {
.build();
MessageManager inbox = mailboxManager.getMailbox(inboxPath, session);
Date now = new Date();
- ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(Charsets.UTF_8));
+ ByteArrayInputStream message1Content = new ByteArrayInputStream("Subject: message 1 subject\r\n\r\nmy message".getBytes(StandardCharsets.UTF_8));
ComposedMessageId message1 = inbox.appendMessage(message1Content, now, session, false, flags);
GetMessagesRequest request = GetMessagesRequest.builder()
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
index 434ca06..66d02e1 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.Optional;
@@ -44,7 +45,6 @@ import org.apache.james.util.mime.MessageContentExtractor;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -74,7 +74,7 @@ public class MessageFactoryTest {
.keywords(Keywords.factory().from(Keyword.SEEN))
.size(0)
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream("".getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(TestMessageId.of(2))
@@ -93,7 +93,7 @@ public class MessageFactoryTest {
.keywords(Keywords.factory().from(Keyword.ANSWERED, Keyword.FLAGGED, Keyword.DRAFT, Keyword.FORWARDED))
.size(0)
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream("".getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(TestMessageId.of(2))
@@ -121,7 +121,7 @@ public class MessageFactoryTest {
.keywords(keywords)
.size(headers.length())
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(headers.getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream(headers.getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(TestMessageId.of(2))
@@ -183,7 +183,7 @@ public class MessageFactoryTest {
.keywords(keywords)
.size(headers.length())
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(headers.getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream(headers.getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(TestMessageId.of(2))
@@ -235,7 +235,7 @@ public class MessageFactoryTest {
.keywords(keywords)
.size(headers.length())
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(headers.getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream(headers.getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(TestMessageId.of(2))
@@ -282,7 +282,7 @@ public class MessageFactoryTest {
.keywords(keywords)
.size(mail.length())
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(mail.getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream(mail.getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(TestMessageId.of(2))
@@ -308,7 +308,7 @@ public class MessageFactoryTest {
+ "Content-Transfer-Encoding: 7bit\n"
+ "\n"
+ "<a>The </a> <strong>HTML</strong> message"
- ).getBytes(Charsets.UTF_8));
+ ).getBytes(StandardCharsets.UTF_8));
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
@@ -344,7 +344,7 @@ public class MessageFactoryTest {
.keywords(Keywords.factory().from(Keyword.SEEN))
.size(mail.length())
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(mail.getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream(mail.getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(TestMessageId.of(2))
@@ -418,7 +418,7 @@ public class MessageFactoryTest {
.keywords(Keywords.factory().from(Keyword.SEEN))
.size(headers.length())
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(headers.getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream(headers.getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(new TestMessageId.Factory().generate())
@@ -447,7 +447,7 @@ public class MessageFactoryTest {
.keywords(Keywords.factory().from(Keyword.SEEN))
.size(headers.length())
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(headers.getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream(headers.getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(new TestMessageId.Factory().generate())
@@ -472,7 +472,7 @@ public class MessageFactoryTest {
.keywords(Keywords.factory().from(Keyword.SEEN))
.size(headers.length())
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(headers.getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream(headers.getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(new TestMessageId.Factory().generate())
@@ -498,7 +498,7 @@ public class MessageFactoryTest {
.keywords(Keywords.factory().from(Keyword.SEEN))
.size(headers.length())
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(headers.getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream(headers.getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(new TestMessageId.Factory().generate())
@@ -523,7 +523,7 @@ public class MessageFactoryTest {
.keywords(Keywords.factory().from(Keyword.SEEN))
.size(headers.length())
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream(headers.getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream(headers.getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(new TestMessageId.Factory().generate())
@@ -541,7 +541,7 @@ public class MessageFactoryTest {
.keywords(Keywords.factory().from(Keyword.SEEN))
.size(1010)
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream((StringUtils.repeat("0123456789", 101).getBytes(Charsets.UTF_8))))
+ .content(new ByteArrayInputStream((StringUtils.repeat("0123456789", 101).getBytes(StandardCharsets.UTF_8))))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(TestMessageId.of(2))
@@ -558,7 +558,7 @@ public class MessageFactoryTest {
ByteArrayInputStream messageContent = new ByteArrayInputStream(("CContent-Type: text/html\r\n"
+ "Subject: message 1 subject\r\n"
+ "\r\n"
- + "my <b>HTML</b> message").getBytes(Charsets.UTF_8));
+ + "my <b>HTML</b> message").getBytes(StandardCharsets.UTF_8));
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
.keywords(Keywords.factory().from(Keyword.SEEN))
@@ -579,7 +579,7 @@ public class MessageFactoryTest {
@Test
public void textBodyShouldBeEmptyInCaseOfEmptyHtmlBodyAndEmptyTextBody() throws Exception {
ByteArrayInputStream messageContent = new ByteArrayInputStream(("CContent-Type: text/html\r\n"
- + "Subject: message 1 subject\r\n").getBytes(Charsets.UTF_8));
+ + "Subject: message 1 subject\r\n").getBytes(StandardCharsets.UTF_8));
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
.keywords(Keywords.factory().from(Keyword.SEEN))
@@ -610,7 +610,7 @@ public class MessageFactoryTest {
ByteArrayInputStream messageContent = new ByteArrayInputStream(("CContent-Type: text/html\r\n"
+ "Subject: message 1 subject\r\n"
+ "\r\n"
- + body).getBytes(Charsets.UTF_8));
+ + body).getBytes(StandardCharsets.UTF_8));
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
@@ -632,7 +632,7 @@ public class MessageFactoryTest {
ByteArrayInputStream messageContent = new ByteArrayInputStream(("CContent-Type: text/plain\r\n"
+ "Subject: message 1 subject\r\n"
+ "\r\n"
- + "My plain text").getBytes(Charsets.UTF_8));
+ + "My plain text").getBytes(StandardCharsets.UTF_8));
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
@@ -651,7 +651,7 @@ public class MessageFactoryTest {
@Test
public void previewBodyShouldReturnStringEmptyWhenNoHtmlBodyAndNoTextBody() throws Exception {
- ByteArrayInputStream messageContent = new ByteArrayInputStream(("Subject: message 1 subject\r\n").getBytes(Charsets.UTF_8));
+ ByteArrayInputStream messageContent = new ByteArrayInputStream(("Subject: message 1 subject\r\n").getBytes(StandardCharsets.UTF_8));
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
@@ -675,7 +675,7 @@ public class MessageFactoryTest {
ByteArrayInputStream messageContent = new ByteArrayInputStream(("CContent-Type: text/html\r\n"
+ "Subject: message 1 subject\r\n"
+ "\r\n"
- + "<html><body></body></html>").getBytes(Charsets.UTF_8));
+ + "<html><body></body></html>").getBytes(StandardCharsets.UTF_8));
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
@@ -711,7 +711,7 @@ public class MessageFactoryTest {
+ "Content-Transfer-Encoding: 7bit\n"
+ "\n"
+ "<html></html>"
- ).getBytes(Charsets.UTF_8));
+ ).getBytes(StandardCharsets.UTF_8));
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
@@ -739,7 +739,7 @@ public class MessageFactoryTest {
.keywords(keywords)
.size(0)
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream("".getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(TestMessageId.of(2))
@@ -757,7 +757,7 @@ public class MessageFactoryTest {
.keywords(keywords)
.size(0)
.internalDate(INTERNAL_DATE)
- .content(new ByteArrayInputStream("".getBytes(Charsets.UTF_8)))
+ .content(new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(MAILBOX_ID)
.messageId(TestMessageId.of(2))
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
index 7dfffc1..d53384a 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/MailFactoryTest.java
@@ -23,6 +23,7 @@ import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.Collection;
@@ -49,7 +50,6 @@ import org.apache.mailet.Mail;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -76,7 +76,7 @@ public class MailFactoryTest {
.keywords(Keywords.factory().from(Keyword.SEEN))
.size(content.length())
.internalDate(Instant.now())
- .sharedContent(new SharedByteArrayInputStream(content.getBytes(Charsets.UTF_8)))
+ .sharedContent(new SharedByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)))
.attachments(ImmutableList.of())
.mailboxId(InMemoryId.of(3))
.messageId(TestMessageId.of(2))
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ChannelManageSieveResponseWriter.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ChannelManageSieveResponseWriter.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ChannelManageSieveResponseWriter.java
index 13f85f8..97b579b 100644
--- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ChannelManageSieveResponseWriter.java
+++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ChannelManageSieveResponseWriter.java
@@ -22,12 +22,11 @@ package org.apache.james.managesieveserver.netty;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.handler.stream.ChunkedStream;
-import com.google.common.base.Charsets;
-
public class ChannelManageSieveResponseWriter {
private final Channel channel;
@@ -37,7 +36,7 @@ public class ChannelManageSieveResponseWriter {
public void write(String response) throws IOException {
if (channel.isConnected()) {
- InputStream in = new ByteArrayInputStream(response.getBytes(Charsets.UTF_8));
+ InputStream in = new ByteArrayInputStream(response.getBytes(StandardCharsets.UTF_8));
channel.write(new ChunkedStream(in));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ba1dd277/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
index 429db13..c8dca1c 100644
--- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
+++ b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/JwtFilterIntegrationTest.java
@@ -25,6 +25,7 @@ import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.apache.james.webadmin.Constants.SEPARATOR;
import static org.assertj.core.api.Assertions.assertThat;
+import java.nio.charset.StandardCharsets;
import java.util.Optional;
import org.apache.commons.io.IOUtils;
@@ -44,7 +45,6 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
-import com.google.common.base.Charsets;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType;
@@ -79,7 +79,7 @@ public class JwtFilterIntegrationTest {
public void setUp() throws Exception {
JwtConfiguration jwtConfiguration = new JwtConfiguration(
Optional.of(
- IOUtils.toString(ClassLoader.getSystemResourceAsStream("jwt_publickey"), Charsets.UTF_8)));
+ IOUtils.toString(ClassLoader.getSystemResourceAsStream("jwt_publickey"), StandardCharsets.UTF_8)));
guiceJamesServer = cassandraJmapTestRule.jmapServer(cassandra.getModule())
.overrideWith(new WebAdminConfigurationModule(),
@@ -92,7 +92,7 @@ public class JwtFilterIntegrationTest {
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)))
.build();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org