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 rc...@apache.org on 2019/12/03 02:02:15 UTC
[james-project] 04/15: JAMES-2997
s/MessagePreviewStore/MessageFastViewProjection/
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 07ec7fd345be3465d498ac35c3d034a25f322b57
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Dec 2 11:39:28 2019 +0700
JAMES-2997 s/MessagePreviewStore/MessageFastViewProjection/
---
.../org/apache/james/modules/data/CassandraJmapModule.java | 12 ++++++------
...wStore.java => CassandraMessageFastViewProjection.java} | 12 ++++++------
....java => CassandraMessageFastViewProjectionModule.java} | 10 +++++-----
...e.java => CassandraMessageFastViewProjectionTable.java} | 2 +-
...st.java => CassandraMessageFastViewProjectionTest.java} | 14 +++++++-------
...agePreviewStore.java => MessageFastViewProjection.java} | 2 +-
...viewStore.java => MemoryMessageFastViewProjection.java} | 6 +++---
...ontract.java => MessageFastViewProjectionContract.java} | 4 ++--
...eTest.java => MemoryMessageFastViewProjectionTest.java} | 12 ++++++------
9 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraJmapModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraJmapModule.java
index 8759d3e..06ac5e9 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraJmapModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/data/CassandraJmapModule.java
@@ -24,14 +24,14 @@ import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
import org.apache.james.jmap.api.access.AccessTokenRepository;
import org.apache.james.jmap.api.filtering.FilteringManagement;
import org.apache.james.jmap.api.filtering.impl.EventSourcingFilteringManagement;
-import org.apache.james.jmap.api.projections.MessagePreviewStore;
+import org.apache.james.jmap.api.projections.MessageFastViewProjection;
import org.apache.james.jmap.api.vacation.NotificationRegistry;
import org.apache.james.jmap.api.vacation.VacationRepository;
import org.apache.james.jmap.cassandra.access.CassandraAccessModule;
import org.apache.james.jmap.cassandra.access.CassandraAccessTokenRepository;
import org.apache.james.jmap.cassandra.filtering.FilteringRuleSetDefineDTOModules;
-import org.apache.james.jmap.cassandra.projections.CassandraMessagePreviewModule;
-import org.apache.james.jmap.cassandra.projections.CassandraMessagePreviewStore;
+import org.apache.james.jmap.cassandra.projections.CassandraMessageFastViewProjection;
+import org.apache.james.jmap.cassandra.projections.CassandraMessageFastViewProjectionModule;
import org.apache.james.jmap.cassandra.vacation.CassandraNotificationRegistry;
import org.apache.james.jmap.cassandra.vacation.CassandraNotificationRegistryModule;
import org.apache.james.jmap.cassandra.vacation.CassandraVacationModule;
@@ -58,14 +58,14 @@ public class CassandraJmapModule extends AbstractModule {
bind(EventSourcingFilteringManagement.class).in(Scopes.SINGLETON);
bind(FilteringManagement.class).to(EventSourcingFilteringManagement.class);
- bind(CassandraMessagePreviewStore.class).in(Scopes.SINGLETON);
- bind(MessagePreviewStore.class).to(CassandraMessagePreviewStore.class);
+ bind(CassandraMessageFastViewProjection.class).in(Scopes.SINGLETON);
+ bind(MessageFastViewProjection.class).to(CassandraMessageFastViewProjection.class);
Multibinder<CassandraModule> cassandraDataDefinitions = Multibinder.newSetBinder(binder(), CassandraModule.class);
cassandraDataDefinitions.addBinding().toInstance(CassandraAccessModule.MODULE);
cassandraDataDefinitions.addBinding().toInstance(CassandraVacationModule.MODULE);
cassandraDataDefinitions.addBinding().toInstance(CassandraNotificationRegistryModule.MODULE);
- cassandraDataDefinitions.addBinding().toInstance(CassandraMessagePreviewModule.MODULE);
+ cassandraDataDefinitions.addBinding().toInstance(CassandraMessageFastViewProjectionModule.MODULE);
Multibinder<EventDTOModule<?, ?>> eventDTOModuleBinder = Multibinder.newSetBinder(binder(), new TypeLiteral<EventDTOModule<?, ?>>() {});
eventDTOModuleBinder.addBinding().toInstance(FilteringRuleSetDefineDTOModules.FILTERING_RULE_SET_DEFINED);
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStore.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessageFastViewProjection.java
similarity index 91%
rename from server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStore.java
rename to server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessageFastViewProjection.java
index b0ce580..afdb547 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStore.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessageFastViewProjection.java
@@ -23,15 +23,15 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker;
import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto;
import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
-import static org.apache.james.jmap.cassandra.projections.table.CassandraMessagePreviewTable.MESSAGE_ID;
-import static org.apache.james.jmap.cassandra.projections.table.CassandraMessagePreviewTable.PREVIEW;
-import static org.apache.james.jmap.cassandra.projections.table.CassandraMessagePreviewTable.TABLE_NAME;
+import static org.apache.james.jmap.cassandra.projections.table.CassandraMessageFastViewProjectionTable.MESSAGE_ID;
+import static org.apache.james.jmap.cassandra.projections.table.CassandraMessageFastViewProjectionTable.PREVIEW;
+import static org.apache.james.jmap.cassandra.projections.table.CassandraMessageFastViewProjectionTable.TABLE_NAME;
import javax.inject.Inject;
import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor;
import org.apache.james.jmap.api.model.Preview;
-import org.apache.james.jmap.api.projections.MessagePreviewStore;
+import org.apache.james.jmap.api.projections.MessageFastViewProjection;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
import org.apache.james.mailbox.model.MessageId;
import org.reactivestreams.Publisher;
@@ -41,7 +41,7 @@ import com.datastax.driver.core.Session;
import com.datastax.driver.core.querybuilder.QueryBuilder;
import com.google.common.base.Preconditions;
-public class CassandraMessagePreviewStore implements MessagePreviewStore {
+public class CassandraMessageFastViewProjection implements MessageFastViewProjection {
private final CassandraAsyncExecutor cassandraAsyncExecutor;
@@ -50,7 +50,7 @@ public class CassandraMessagePreviewStore implements MessagePreviewStore {
private final PreparedStatement deleteStatement;
@Inject
- CassandraMessagePreviewStore(Session session) {
+ CassandraMessageFastViewProjection(Session session) {
this.cassandraAsyncExecutor = new CassandraAsyncExecutor(session);
this.deleteStatement = session.prepare(QueryBuilder.delete()
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewModule.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessageFastViewProjectionModule.java
similarity index 86%
rename from server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewModule.java
rename to server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessageFastViewProjectionModule.java
index a85d67e..5c56e9b 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewModule.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessageFastViewProjectionModule.java
@@ -24,18 +24,18 @@ import static com.datastax.driver.core.DataType.uuid;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.utils.CassandraConstants;
-import org.apache.james.jmap.cassandra.projections.table.CassandraMessagePreviewTable;
+import org.apache.james.jmap.cassandra.projections.table.CassandraMessageFastViewProjectionTable;
import com.datastax.driver.core.schemabuilder.SchemaBuilder;
-public interface CassandraMessagePreviewModule {
- CassandraModule MODULE = CassandraModule.table(CassandraMessagePreviewTable.TABLE_NAME)
+public interface CassandraMessageFastViewProjectionModule {
+ CassandraModule MODULE = CassandraModule.table(CassandraMessageFastViewProjectionTable.TABLE_NAME)
.comment("Storing the JMAP preview property extracted from message bodies")
.options(options -> options
.caching(SchemaBuilder.KeyCaching.ALL,
SchemaBuilder.rows(CassandraConstants.DEFAULT_CACHED_ROW_PER_PARTITION)))
.statement(statement -> statement
- .addPartitionKey(CassandraMessagePreviewTable.MESSAGE_ID, uuid())
- .addColumn(CassandraMessagePreviewTable.PREVIEW, text()))
+ .addPartitionKey(CassandraMessageFastViewProjectionTable.MESSAGE_ID, uuid())
+ .addColumn(CassandraMessageFastViewProjectionTable.PREVIEW, text()))
.build();
}
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/table/CassandraMessagePreviewTable.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/table/CassandraMessageFastViewProjectionTable.java
similarity index 95%
rename from server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/table/CassandraMessagePreviewTable.java
rename to server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/table/CassandraMessageFastViewProjectionTable.java
index 4826263..4035626 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/table/CassandraMessagePreviewTable.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/table/CassandraMessageFastViewProjectionTable.java
@@ -19,7 +19,7 @@
package org.apache.james.jmap.cassandra.projections.table;
-public interface CassandraMessagePreviewTable {
+public interface CassandraMessageFastViewProjectionTable {
String TABLE_NAME = "message_preview";
String MESSAGE_ID = "messageId";
diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStoreTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/projections/CassandraMessageFastViewProjectionTest.java
similarity index 85%
rename from server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStoreTest.java
rename to server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/projections/CassandraMessageFastViewProjectionTest.java
index c8d638b..3803fbe 100644
--- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStoreTest.java
+++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/projections/CassandraMessageFastViewProjectionTest.java
@@ -22,8 +22,8 @@ package org.apache.james.jmap.cassandra.projections;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
-import org.apache.james.jmap.api.projections.MessagePreviewStore;
-import org.apache.james.jmap.api.projections.MessagePreviewStoreContract;
+import org.apache.james.jmap.api.projections.MessageFastViewProjection;
+import org.apache.james.jmap.api.projections.MessageFastViewProjectionContract;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.TestMessageId;
@@ -31,22 +31,22 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-class CassandraMessagePreviewStoreTest implements MessagePreviewStoreContract {
+class CassandraMessageFastViewProjectionTest implements MessageFastViewProjectionContract {
@RegisterExtension
- static CassandraClusterExtension cassandra = new CassandraClusterExtension(CassandraMessagePreviewModule.MODULE);
+ static CassandraClusterExtension cassandra = new CassandraClusterExtension(CassandraMessageFastViewProjectionModule.MODULE);
- private CassandraMessagePreviewStore testee;
+ private CassandraMessageFastViewProjection testee;
private CassandraMessageId.Factory cassandraMessageIdFactory;
@BeforeEach
void setUp() {
cassandraMessageIdFactory = new CassandraMessageId.Factory();
- testee = new CassandraMessagePreviewStore(cassandra.getCassandraCluster().getConf());
+ testee = new CassandraMessageFastViewProjection(cassandra.getCassandraCluster().getConf());
}
@Override
- public MessagePreviewStore testee() {
+ public MessageFastViewProjection testee() {
return testee;
}
diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessagePreviewStore.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewProjection.java
similarity index 97%
rename from server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessagePreviewStore.java
rename to server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewProjection.java
index 00a126c..8245651 100644
--- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessagePreviewStore.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewProjection.java
@@ -23,7 +23,7 @@ import org.apache.james.jmap.api.model.Preview;
import org.apache.james.mailbox.model.MessageId;
import org.reactivestreams.Publisher;
-public interface MessagePreviewStore {
+public interface MessageFastViewProjection {
Publisher<Void> store(MessageId messageId, Preview preview);
diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/preview/MemoryMessagePreviewStore.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/preview/MemoryMessageFastViewProjection.java
similarity index 91%
rename from server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/preview/MemoryMessagePreviewStore.java
rename to server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/preview/MemoryMessageFastViewProjection.java
index 49ae891..d1f177a 100644
--- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/preview/MemoryMessagePreviewStore.java
+++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/preview/MemoryMessageFastViewProjection.java
@@ -22,7 +22,7 @@ package org.apache.james.jmap.memory.preview;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.james.jmap.api.model.Preview;
-import org.apache.james.jmap.api.projections.MessagePreviewStore;
+import org.apache.james.jmap.api.projections.MessageFastViewProjection;
import org.apache.james.mailbox.model.MessageId;
import org.reactivestreams.Publisher;
@@ -30,11 +30,11 @@ import com.google.common.base.Preconditions;
import reactor.core.publisher.Mono;
-public class MemoryMessagePreviewStore implements MessagePreviewStore {
+public class MemoryMessageFastViewProjection implements MessageFastViewProjection {
private final ConcurrentHashMap<MessageId, Preview> previews;
- public MemoryMessagePreviewStore() {
+ public MemoryMessageFastViewProjection() {
this.previews = new ConcurrentHashMap<>();
}
diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessagePreviewStoreContract.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionContract.java
similarity index 98%
rename from server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessagePreviewStoreContract.java
rename to server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionContract.java
index 0d4ec17..eddb59e 100644
--- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessagePreviewStoreContract.java
+++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessageFastViewProjectionContract.java
@@ -35,12 +35,12 @@ import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
-public interface MessagePreviewStoreContract {
+public interface MessageFastViewProjectionContract {
Preview PREVIEW_1 = Preview.from("preview 1");
Preview PREVIEW_2 = Preview.from("preview 2");
- MessagePreviewStore testee();
+ MessageFastViewProjection testee();
MessageId newMessageId();
diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/preview/MemoryMessagePreviewStoreTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/preview/MemoryMessageFastViewProjectionTest.java
similarity index 80%
rename from server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/preview/MemoryMessagePreviewStoreTest.java
rename to server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/preview/MemoryMessageFastViewProjectionTest.java
index 8e1827b..1e2033f 100644
--- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/preview/MemoryMessagePreviewStoreTest.java
+++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/memory/preview/MemoryMessageFastViewProjectionTest.java
@@ -19,25 +19,25 @@
package org.apache.james.jmap.memory.preview;
-import org.apache.james.jmap.api.projections.MessagePreviewStore;
-import org.apache.james.jmap.api.projections.MessagePreviewStoreContract;
+import org.apache.james.jmap.api.projections.MessageFastViewProjection;
+import org.apache.james.jmap.api.projections.MessageFastViewProjectionContract;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.TestMessageId;
import org.junit.jupiter.api.BeforeEach;
-class MemoryMessagePreviewStoreTest implements MessagePreviewStoreContract {
+class MemoryMessageFastViewProjectionTest implements MessageFastViewProjectionContract {
- private MemoryMessagePreviewStore testee;
+ private MemoryMessageFastViewProjection testee;
private TestMessageId.Factory messageIdFactory;
@BeforeEach
void setUp() {
messageIdFactory = new TestMessageId.Factory();
- testee = new MemoryMessagePreviewStore();
+ testee = new MemoryMessageFastViewProjection();
}
@Override
- public MessagePreviewStore testee() {
+ public MessageFastViewProjection testee() {
return testee;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org