This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 0fea8c6beef103a2d0ee6bfdc042f2b75ec1779d
Author: Gautier DI FOLCO <gdifo...@linagora.com>
AuthorDate: Thu Aug 1 12:03:04 2019 +0200
JAMES-2813 Rename Cassandra Task Manager into Distributed Task Manager
---
pom.xml | 4 ++--
server/container/guice/cassandra-guice/pom.xml | 4 ++--
.../src/test/java/org/apache/james/CassandraTaskManagerTest.java | 2 +-
server/pom.xml | 2 +-
server/{task-cassandra => task-distributed}/pom.xml | 4 ++--
.../task/eventsourcing/distributed}/TasksSerializationModule.java | 2 +-
.../cassandra/CassandraTaskExecutionDetailsProjection.scala | 7 ++++---
.../cassandra/CassandraTaskExecutionDetailsProjectionDAO.scala | 8 +++-----
.../cassandra/CassandraTaskExecutionDetailsProjectionModule.scala | 0
.../james/task/eventsourcing/distributed}/TaskEventDTO.scala | 2 +-
.../cassandra/CassandraTaskExecutionDetailsProjectionDAOTest.java | 1 +
.../cassandra/CassandraTaskExecutionDetailsProjectionTest.java | 2 ++
.../eventsourcing/distributed}/TaskEventsSerializationTest.java | 2 +-
13 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1459c2d..6b546f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1702,12 +1702,12 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-task-cassandra</artifactId>
+ <artifactId>james-server-task-distributed</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-task-cassandra</artifactId>
+ <artifactId>james-server-task-distributed</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
diff --git a/server/container/guice/cassandra-guice/pom.xml
b/server/container/guice/cassandra-guice/pom.xml
index 90c823b..f5440a7 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -246,11 +246,11 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-task-cassandra</artifactId>
+ <artifactId>james-server-task-distributed</artifactId>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-task-cassandra</artifactId>
+ <artifactId>james-server-task-distributed</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraTaskManagerTest.java
b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraTaskManagerTest.java
index 72cd9ff..8f465e5 100644
---
a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraTaskManagerTest.java
+++
b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraTaskManagerTest.java
@@ -49,7 +49,7 @@ import
org.apache.james.task.eventsourcing.WorkerStatusListener;
import
org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjection;
import
org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjectionDAO;
import
org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjectionModule;
-import org.apache.james.task.eventsourcing.cassandra.TasksSerializationModule;
+import
org.apache.james.task.eventsourcing.distributed.TasksSerializationModule;
import org.awaitility.Awaitility;
import org.awaitility.Duration;
import org.junit.jupiter.api.Test;
diff --git a/server/pom.xml b/server/pom.xml
index 7fef183..d890234 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -104,7 +104,7 @@
<module>queue/queue-rabbitmq</module>
<module>task</module>
- <module>task-cassandra</module>
+ <module>task-distributed</module>
<module>task-json</module>
<module>testing</module>
</modules>
diff --git a/server/task-cassandra/pom.xml b/server/task-distributed/pom.xml
similarity index 97%
rename from server/task-cassandra/pom.xml
rename to server/task-distributed/pom.xml
index 1200ea1..63a7a01 100644
--- a/server/task-cassandra/pom.xml
+++ b/server/task-distributed/pom.xml
@@ -28,8 +28,8 @@
<version>3.4.0-SNAPSHOT</version>
</parent>
- <artifactId>james-server-task-cassandra</artifactId>
- <name>Apache James :: Server :: Task :: Cassandra</name>
+ <artifactId>james-server-task-distributed</artifactId>
+ <name>Apache James :: Server :: Task :: Distributed</name>
<dependencies>
<dependency>
diff --git
a/server/task-cassandra/src/main/java/org/apache/james/task/eventsourcing/cassandra/TasksSerializationModule.java
b/server/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TasksSerializationModule.java
similarity index 98%
rename from
server/task-cassandra/src/main/java/org/apache/james/task/eventsourcing/cassandra/TasksSerializationModule.java
rename to
server/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TasksSerializationModule.java
index cf61fcc..acc19bf 100644
---
a/server/task-cassandra/src/main/java/org/apache/james/task/eventsourcing/cassandra/TasksSerializationModule.java
+++
b/server/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TasksSerializationModule.java
@@ -17,7 +17,7 @@
* under the License. *
* ***************************************************************/
-package org.apache.james.task.eventsourcing.cassandra;
+package org.apache.james.task.eventsourcing.distributed;
import java.util.List;
import java.util.function.Function;
diff --git
a/server/task-cassandra/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjection.scala
b/server/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjection.scala
similarity index 97%
rename from
server/task-cassandra/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjection.scala
rename to
server/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjection.scala
index f621c44..ee2b68b 100644
---
a/server/task-cassandra/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjection.scala
+++
b/server/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjection.scala
@@ -20,10 +20,11 @@
package org.apache.james.task.eventsourcing.cassandra
import javax.inject.Inject
-import scala.compat.java8.OptionConverters._
-import collection.JavaConverters._
-import org.apache.james.task.{TaskExecutionDetails, TaskId}
import org.apache.james.task.eventsourcing.TaskExecutionDetailsProjection
+import org.apache.james.task.{TaskExecutionDetails, TaskId}
+
+import scala.collection.JavaConverters._
+import scala.compat.java8.OptionConverters._
@Inject
class
CassandraTaskExecutionDetailsProjection(cassandraTaskExecutionDetailsProjectionDAO:
CassandraTaskExecutionDetailsProjectionDAO) extends
TaskExecutionDetailsProjection {
diff --git
a/server/task-cassandra/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAO.scala
b/server/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAO.scala
similarity index 99%
rename from
server/task-cassandra/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAO.scala
rename to
server/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAO.scala
index 1a46fa4..1dff42f 100644
---
a/server/task-cassandra/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAO.scala
+++
b/server/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAO.scala
@@ -20,16 +20,14 @@ package org.apache.james.task.eventsourcing.cassandra
import java.util.Optional
+import com.datastax.driver.core.querybuilder.QueryBuilder
+import com.datastax.driver.core.querybuilder.QueryBuilder.{bindMarker,
insertInto, select}
+import com.datastax.driver.core.{Row, Session}
import javax.inject.Inject
-
import org.apache.james.backends.cassandra.init.{CassandraTypesProvider,
CassandraZonedDateTimeModule}
import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor
import
org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjectionTable._
import org.apache.james.task.{TaskExecutionDetails, TaskId, TaskManager}
-
-import com.datastax.driver.core.querybuilder.QueryBuilder
-import com.datastax.driver.core.querybuilder.QueryBuilder.{bindMarker,
insertInto, select}
-import com.datastax.driver.core.{Row, Session}
import reactor.core.publisher.{Flux, Mono}
@Inject
diff --git
a/server/task-cassandra/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionModule.scala
b/server/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionModule.scala
similarity index 100%
rename from
server/task-cassandra/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionModule.scala
rename to
server/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionModule.scala
diff --git
a/server/task-cassandra/src/main/scala/org/apache/james/task/eventsourcing/cassandra/TaskEventDTO.scala
b/server/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/distributed/TaskEventDTO.scala
similarity index 99%
rename from
server/task-cassandra/src/main/scala/org/apache/james/task/eventsourcing/cassandra/TaskEventDTO.scala
rename to
server/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/distributed/TaskEventDTO.scala
index 55fe259..3bbcdda 100644
---
a/server/task-cassandra/src/main/scala/org/apache/james/task/eventsourcing/cassandra/TaskEventDTO.scala
+++
b/server/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/distributed/TaskEventDTO.scala
@@ -17,7 +17,7 @@
* under the License. *
* ***************************************************************/
-package org.apache.james.task.eventsourcing.cassandra
+package org.apache.james.task.eventsourcing.distributed
import com.fasterxml.jackson.annotation.JsonProperty
import org.apache.james.eventsourcing.EventId
diff --git
a/server/task-cassandra/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAOTest.java
b/server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAOTest.java
similarity index 98%
rename from
server/task-cassandra/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAOTest.java
rename to
server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAOTest.java
index 76229d6..73f6973 100644
---
a/server/task-cassandra/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAOTest.java
+++
b/server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAOTest.java
@@ -36,6 +36,7 @@ import
org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.CassandraZonedDateTimeModule;
import
org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
import org.apache.james.task.TaskExecutionDetails;
+import
org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjectionDAO;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git
a/server/task-cassandra/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionTest.java
b/server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionTest.java
similarity index 94%
rename from
server/task-cassandra/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionTest.java
rename to
server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionTest.java
index 8ccc78e..731cfdd 100644
---
a/server/task-cassandra/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionTest.java
+++
b/server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionTest.java
@@ -29,6 +29,8 @@ import
org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule
import org.apache.james.task.eventsourcing.TaskExecutionDetailsProjection;
import
org.apache.james.task.eventsourcing.TaskExecutionDetailsProjectionContract;
+import
org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjection;
+import
org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjectionDAO;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
diff --git
a/server/task-cassandra/src/test/java/org/apache/james/task/eventsourcing/cassandra/TaskEventsSerializationTest.java
b/server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/TaskEventsSerializationTest.java
similarity index 98%
rename from
server/task-cassandra/src/test/java/org/apache/james/task/eventsourcing/cassandra/TaskEventsSerializationTest.java
rename to
server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/TaskEventsSerializationTest.java
index a522b95..53952fd 100644
---
a/server/task-cassandra/src/test/java/org/apache/james/task/eventsourcing/cassandra/TaskEventsSerializationTest.java
+++
b/server/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/TaskEventsSerializationTest.java
@@ -17,7 +17,7 @@
* under the License. *
* ***************************************************************/
-package org.apache.james.task.eventsourcing.cassandra;
+package org.apache.james.task.eventsourcing.distributed;
import static org.assertj.core.api.Assertions.assertThat;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
