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 3a30ddafd1d64d43e7c997877f197d8d661945a3 Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Mon Dec 2 11:36:59 2019 +0700 JAMES-2997 Move MessagePreviewStore to a projections package --- .../org/apache/james/modules/data/CassandraJmapModule.java | 6 +++--- .../CassandraMessagePreviewModule.java | 4 ++-- .../{preview => projections}/CassandraMessagePreviewStore.java | 10 +++++----- .../table/CassandraMessagePreviewTable.java | 2 +- .../CassandraMessagePreviewStoreTest.java | 6 +++--- .../MessageFastViewPrecomputedProperties.java | 4 +++- .../jmap/api/{preview => projections}/MessagePreviewStore.java | 3 ++- .../james/jmap/memory/preview/MemoryMessagePreviewStore.java | 2 +- .../MessageFastViewPrecomputedPropertiesTest.java | 2 +- .../{preview => projections}/MessagePreviewStoreContract.java | 3 ++- .../jmap/memory/preview/MemoryMessagePreviewStoreTest.java | 4 ++-- 11 files changed, 25 insertions(+), 21 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 8cdfe65..8759d3e 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.preview.MessagePreviewStore; +import org.apache.james.jmap.api.projections.MessagePreviewStore; 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.preview.CassandraMessagePreviewModule; -import org.apache.james.jmap.cassandra.preview.CassandraMessagePreviewStore; +import org.apache.james.jmap.cassandra.projections.CassandraMessagePreviewModule; +import org.apache.james.jmap.cassandra.projections.CassandraMessagePreviewStore; import org.apache.james.jmap.cassandra.vacation.CassandraNotificationRegistry; import org.apache.james.jmap.cassandra.vacation.CassandraNotificationRegistryModule; import org.apache.james.jmap.cassandra.vacation.CassandraVacationModule; diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/preview/CassandraMessagePreviewModule.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewModule.java similarity index 93% rename from server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/preview/CassandraMessagePreviewModule.java rename to server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewModule.java index c9b942a..a85d67e 100644 --- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/preview/CassandraMessagePreviewModule.java +++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewModule.java @@ -17,14 +17,14 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.cassandra.preview; +package org.apache.james.jmap.cassandra.projections; import static com.datastax.driver.core.DataType.text; 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.preview.table.CassandraMessagePreviewTable; +import org.apache.james.jmap.cassandra.projections.table.CassandraMessagePreviewTable; import com.datastax.driver.core.schemabuilder.SchemaBuilder; diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/preview/CassandraMessagePreviewStore.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStore.java similarity index 90% rename from server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/preview/CassandraMessagePreviewStore.java rename to server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStore.java index f97b024..7ee5607 100644 --- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/preview/CassandraMessagePreviewStore.java +++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStore.java @@ -17,21 +17,21 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.cassandra.preview; +package org.apache.james.jmap.cassandra.projections; 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.preview.table.CassandraMessagePreviewTable.MESSAGE_ID; -import static org.apache.james.jmap.cassandra.preview.table.CassandraMessagePreviewTable.PREVIEW; -import static org.apache.james.jmap.cassandra.preview.table.CassandraMessagePreviewTable.TABLE_NAME; +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 javax.inject.Inject; import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; -import org.apache.james.jmap.api.preview.MessagePreviewStore; import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.projections.MessagePreviewStore; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.model.MessageId; import org.reactivestreams.Publisher; diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/preview/table/CassandraMessagePreviewTable.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/table/CassandraMessagePreviewTable.java similarity index 95% rename from server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/preview/table/CassandraMessagePreviewTable.java rename to server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/table/CassandraMessagePreviewTable.java index df849f2..4826263 100644 --- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/preview/table/CassandraMessagePreviewTable.java +++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/table/CassandraMessagePreviewTable.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.cassandra.preview.table; +package org.apache.james.jmap.cassandra.projections.table; public interface CassandraMessagePreviewTable { String TABLE_NAME = "message_preview"; diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/preview/CassandraMessagePreviewStoreTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStoreTest.java similarity index 94% rename from server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/preview/CassandraMessagePreviewStoreTest.java rename to server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStoreTest.java index 9369f39..c8d638b 100644 --- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/preview/CassandraMessagePreviewStoreTest.java +++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/projections/CassandraMessagePreviewStoreTest.java @@ -17,13 +17,13 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.cassandra.preview; +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.preview.MessagePreviewStore; -import org.apache.james.jmap.api.preview.MessagePreviewStoreContract; +import org.apache.james.jmap.api.projections.MessagePreviewStore; +import org.apache.james.jmap.api.projections.MessagePreviewStoreContract; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.TestMessageId; diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/preview/MessageFastViewPrecomputedProperties.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewPrecomputedProperties.java similarity index 96% rename from server/data/data-jmap/src/main/java/org/apache/james/jmap/api/preview/MessageFastViewPrecomputedProperties.java rename to server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewPrecomputedProperties.java index bf814f8..567f01f 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/preview/MessageFastViewPrecomputedProperties.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewPrecomputedProperties.java @@ -17,10 +17,12 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.api.preview; +package org.apache.james.jmap.api.projections; import java.util.Objects; +import org.apache.james.jmap.api.preview.Preview; + import com.google.common.base.Preconditions; public class MessageFastViewPrecomputedProperties { diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/preview/MessagePreviewStore.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessagePreviewStore.java similarity index 93% rename from server/data/data-jmap/src/main/java/org/apache/james/jmap/api/preview/MessagePreviewStore.java rename to server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessagePreviewStore.java index c772b80..1a90c0f 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/preview/MessagePreviewStore.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessagePreviewStore.java @@ -17,8 +17,9 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.api.preview; +package org.apache.james.jmap.api.projections; +import org.apache.james.jmap.api.preview.Preview; import org.apache.james.mailbox.model.MessageId; import org.reactivestreams.Publisher; 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/MemoryMessagePreviewStore.java index 58bf9c4..11d8b0d 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/MemoryMessagePreviewStore.java @@ -21,8 +21,8 @@ package org.apache.james.jmap.memory.preview; import java.util.concurrent.ConcurrentHashMap; -import org.apache.james.jmap.api.preview.MessagePreviewStore; import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.projections.MessagePreviewStore; import org.apache.james.mailbox.model.MessageId; import org.reactivestreams.Publisher; diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/preview/MessageFastViewPrecomputedPropertiesTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessageFastViewPrecomputedPropertiesTest.java similarity index 96% rename from server/data/data-jmap/src/test/java/org/apache/james/jmap/api/preview/MessageFastViewPrecomputedPropertiesTest.java rename to server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessageFastViewPrecomputedPropertiesTest.java index fe0064f..3fac143 100644 --- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/preview/MessageFastViewPrecomputedPropertiesTest.java +++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessageFastViewPrecomputedPropertiesTest.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.api.preview; +package org.apache.james.jmap.api.projections; import org.junit.jupiter.api.Test; diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/preview/MessagePreviewStoreContract.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessagePreviewStoreContract.java similarity index 98% rename from server/data/data-jmap/src/test/java/org/apache/james/jmap/api/preview/MessagePreviewStoreContract.java rename to server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessagePreviewStoreContract.java index bb8546f..f653255 100644 --- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/preview/MessagePreviewStoreContract.java +++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/projections/MessagePreviewStoreContract.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.api.preview; +package org.apache.james.jmap.api.projections; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; @@ -27,6 +27,7 @@ import java.time.Duration; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.IntStream; +import org.apache.james.jmap.api.preview.Preview; import org.apache.james.mailbox.model.MessageId; import org.apache.james.util.concurrency.ConcurrentTestRunner; import org.assertj.core.api.SoftAssertions; 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/MemoryMessagePreviewStoreTest.java index 73d7809..8e1827b 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/MemoryMessagePreviewStoreTest.java @@ -19,8 +19,8 @@ package org.apache.james.jmap.memory.preview; -import org.apache.james.jmap.api.preview.MessagePreviewStore; -import org.apache.james.jmap.api.preview.MessagePreviewStoreContract; +import org.apache.james.jmap.api.projections.MessagePreviewStore; +import org.apache.james.jmap.api.projections.MessagePreviewStoreContract; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.TestMessageId; import org.junit.jupiter.api.BeforeEach; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org