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 ma...@apache.org on 2017/10/23 10:10:01 UTC
[3/5] james-project git commit: JAMES-2198 migration
StringEscapteUtils and RandomStringUtils to commons-text
JAMES-2198 migration StringEscapteUtils and RandomStringUtils to commons-text
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/9eeb870d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/9eeb870d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/9eeb870d
Branch: refs/heads/master
Commit: 9eeb870d735941bb97b23faca00fb0b8f10d3dbc
Parents: 57d80d6
Author: Matthieu Baechler <ma...@apache.org>
Authored: Fri Oct 20 14:54:44 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Mon Oct 23 12:09:24 2017 +0200
----------------------------------------------------------------------
backends-common/cassandra/pom.xml | 4 ++++
.../org/apache/james/backends/cassandra/CassandraCluster.java | 4 ++--
.../apache/james/backends/cassandra/DockerCassandraRule.java | 4 ++--
pom.xml | 5 +++++
.../src/test/java/org/apache/james/DockerCassandraRule.java | 4 ++--
.../jmap-integration-testing-common/pom.xml | 4 ++++
.../methods/integration/cucumber/GetMessagesMethodStepdefs.java | 2 +-
7 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/9eeb870d/backends-common/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml
index d295c70..66d3bb3 100644
--- a/backends-common/cassandra/pom.xml
+++ b/backends-common/cassandra/pom.xml
@@ -91,6 +91,10 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/9eeb870d/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
index d649c31..27ababf 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java
@@ -26,7 +26,7 @@ import javax.inject.Named;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.text.RandomStringGenerator;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.CassandraSessionConfiguration;
import org.apache.james.backends.cassandra.init.CassandraTypesProvider;
@@ -66,7 +66,7 @@ public final class CassandraCluster implements AutoCloseable {
.host(host)
.port(port)
.build();
- keyspace = RandomStringUtils.randomAlphabetic(10);
+ keyspace = new RandomStringGenerator.Builder().withinRange('a', 'z').build().generate(10);
cassandraSessionConfiguration = () -> {
PropertiesConfiguration conf = new PropertiesConfiguration();
conf.addProperty("cassandra.nodes", host + ":" + port);
http://git-wip-us.apache.org/repos/asf/james-project/blob/9eeb870d/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
index 303eb54..beab426 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandraRule.java
@@ -19,7 +19,7 @@
package org.apache.james.backends.cassandra;
-import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.text.RandomStringGenerator;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -56,7 +56,7 @@ public class DockerCassandraRule implements TestRule {
@SuppressWarnings("resource")
public DockerCassandraRule() {
- String tmpFsName = "cassandraData" + RandomStringUtils.randomAlphabetic(10);
+ String tmpFsName = "cassandraData" + new RandomStringGenerator.Builder().withinRange('a', 'z').build().generate(10);
client = DockerClientFactory.instance().client();
createTmpsFsCmd = client.createVolumeCmd()
.withName(tmpFsName)
http://git-wip-us.apache.org/repos/asf/james-project/blob/9eeb870d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d40ed1..82e86db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1796,6 +1796,11 @@
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/9eeb870d/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
index dc7c199..11ff70c 100644
--- a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
+++ b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/DockerCassandraRule.java
@@ -19,7 +19,7 @@
package org.apache.james;
import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.text.RandomStringGenerator;
import org.apache.james.backends.cassandra.init.CassandraSessionConfiguration;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -55,7 +55,7 @@ public class DockerCassandraRule implements GuiceModuleTestRule {
@Override
public Module getModule() {
- String keyspace = RandomStringUtils.randomAlphabetic(12);
+ String keyspace = new RandomStringGenerator.Builder().withinRange('a', 'z').build().generate(12);
return (binder) -> binder.bind(CassandraSessionConfiguration.class).toInstance(() -> getCassandraConfigurationForDocker(keyspace));
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/9eeb870d/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
index 8e348ae..349f151 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml
@@ -116,6 +116,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/9eeb870d/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 3c4d28f..08f4a79 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
@@ -36,8 +36,8 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.mail.Flags;
-import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.fluent.Request;
import org.apache.james.jmap.DefaultMailboxes;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org