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:16 UTC
[2/3] james-project git commit: JAMES-2270 Replace uses of
considered-deprecated constants
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