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 d8fda29d7a2fc432f19cea0e17015076a6626a37 Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Mon Dec 2 11:38:20 2019 +0700 JAMES-2997 Move Preview in a model package --- .../james/jmap/cassandra/projections/CassandraMessagePreviewStore.java | 2 +- .../main/java/org/apache/james/jmap/api/{preview => model}/Preview.java | 2 +- .../jmap/api/projections/MessageFastViewPrecomputedProperties.java | 2 +- .../java/org/apache/james/jmap/api/projections/MessagePreviewStore.java | 2 +- .../org/apache/james/jmap/memory/preview/MemoryMessagePreviewStore.java | 2 +- .../java/org/apache/james/jmap/api/{preview => model}/PreviewTest.java | 2 +- .../apache/james/jmap/api/projections/MessagePreviewStoreContract.java | 2 +- .../src/main/java/org/apache/james/jmap/draft/model/PreviewDTO.java | 2 +- .../org/apache/james/jmap/draft/model/message/view/MessageFullView.java | 2 +- .../james/jmap/draft/model/message/view/MessageFullViewFactory.java | 2 +- .../java/org/apache/james/jmap/draft/json/ParsingWritingObjects.java | 2 +- .../src/test/java/org/apache/james/jmap/draft/model/PreviewDTOTest.java | 2 +- .../java/org/apache/james/jmap/draft/model/SetMessagesResponseTest.java | 2 +- .../james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java | 2 +- .../apache/james/jmap/draft/model/message/view/MessageFullViewTest.java | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) 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/CassandraMessagePreviewStore.java index 7ee5607..b0ce580 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/CassandraMessagePreviewStore.java @@ -30,7 +30,7 @@ import static org.apache.james.jmap.cassandra.projections.table.CassandraMessage import javax.inject.Inject; import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.Preview; import org.apache.james.jmap.api.projections.MessagePreviewStore; import org.apache.james.mailbox.cassandra.ids.CassandraMessageId; import org.apache.james.mailbox.model.MessageId; diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/preview/Preview.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/model/Preview.java similarity index 98% rename from server/data/data-jmap/src/main/java/org/apache/james/jmap/api/preview/Preview.java rename to server/data/data-jmap/src/main/java/org/apache/james/jmap/api/model/Preview.java index 90c2fe2..ed69078 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/preview/Preview.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/model/Preview.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.api.preview; +package org.apache.james.jmap.api.model; import java.util.Objects; diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewPrecomputedProperties.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewPrecomputedProperties.java index 567f01f..ee2cdca 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewPrecomputedProperties.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/projections/MessageFastViewPrecomputedProperties.java @@ -21,7 +21,7 @@ package org.apache.james.jmap.api.projections; import java.util.Objects; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.Preview; import com.google.common.base.Preconditions; 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/MessagePreviewStore.java index 1a90c0f..00a126c 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/MessagePreviewStore.java @@ -19,7 +19,7 @@ package org.apache.james.jmap.api.projections; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.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 11d8b0d..49ae891 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,7 +21,7 @@ package org.apache.james.jmap.memory.preview; import java.util.concurrent.ConcurrentHashMap; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.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/PreviewTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/model/PreviewTest.java similarity index 99% rename from server/data/data-jmap/src/test/java/org/apache/james/jmap/api/preview/PreviewTest.java rename to server/data/data-jmap/src/test/java/org/apache/james/jmap/api/model/PreviewTest.java index 8a897b2..5198ac2 100644 --- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/preview/PreviewTest.java +++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/model/PreviewTest.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.api.preview; +package org.apache.james.jmap.api.model; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; 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/MessagePreviewStoreContract.java index f653255..0d4ec17 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/MessagePreviewStoreContract.java @@ -27,7 +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.jmap.api.model.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/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/PreviewDTO.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/PreviewDTO.java index 6b2457c..4984845 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/PreviewDTO.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/PreviewDTO.java @@ -22,7 +22,7 @@ package org.apache.james.jmap.draft.model; import java.util.Objects; import java.util.Optional; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.Preview; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.annotations.VisibleForTesting; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullView.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullView.java index 40399c9..aac8eda 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullView.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullView.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Predicate; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.Preview; import org.apache.james.jmap.draft.methods.JmapResponseWriterImpl; import org.apache.james.jmap.draft.model.Attachment; import org.apache.james.jmap.draft.model.BlobId; diff --git a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactory.java b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactory.java index bc17419..913d547 100644 --- a/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactory.java +++ b/server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactory.java @@ -30,7 +30,7 @@ import java.util.Set; import javax.inject.Inject; import javax.mail.internet.SharedInputStream; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.Preview; import org.apache.james.jmap.draft.model.Attachment; import org.apache.james.jmap.draft.model.BlobId; import org.apache.james.jmap.draft.model.Keywords; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjects.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjects.java index 0f355ff..dab006b 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjects.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/json/ParsingWritingObjects.java @@ -24,7 +24,7 @@ import java.util.Optional; import javax.mail.Flags; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.Preview; import org.apache.james.jmap.draft.model.BlobId; import org.apache.james.jmap.draft.model.Emailer; import org.apache.james.jmap.draft.model.Keyword; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/PreviewDTOTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/PreviewDTOTest.java index 95b1a79..470e476 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/PreviewDTOTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/PreviewDTOTest.java @@ -23,7 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.Optional; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.Preview; import org.junit.jupiter.api.Test; import nl.jqno.equalsverifier.EqualsVerifier; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/SetMessagesResponseTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/SetMessagesResponseTest.java index 94c678b..b668490 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/SetMessagesResponseTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/SetMessagesResponseTest.java @@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Instant; import org.apache.commons.lang3.NotImplementedException; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.Preview; import org.apache.james.jmap.draft.model.message.view.MessageFullView; import org.apache.james.mailbox.inmemory.InMemoryId; import org.apache.james.mailbox.model.MessageId; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java index e0c3ff9..cc71703 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java @@ -35,7 +35,7 @@ import java.util.Optional; import javax.mail.Flags; import org.apache.commons.lang3.StringUtils; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.Preview; import org.apache.james.jmap.draft.model.Attachment; import org.apache.james.jmap.draft.model.BlobId; import org.apache.james.jmap.draft.model.Emailer; diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewTest.java index 81c64e6..2cdf070 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.time.Instant; import java.util.Optional; -import org.apache.james.jmap.api.preview.Preview; +import org.apache.james.jmap.api.model.Preview; import org.apache.james.jmap.draft.model.Attachment; import org.apache.james.jmap.draft.model.BlobId; import org.apache.james.jmap.draft.model.Emailer; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org