MAILBOX-273 move MailboxId to mailbox-api project
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/73b2da08 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/73b2da08 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/73b2da08 Branch: refs/heads/master Commit: 73b2da08b5239ace21b1a4b950945c4187c515fe Parents: 55b1476 Author: Matthieu Baechler <matthieu.baech...@linagora.com> Authored: Mon Jul 18 14:13:11 2016 +0200 Committer: Matthieu Baechler <matthieu.baech...@linagora.com> Committed: Mon Jul 25 10:13:29 2016 +0200 ---------------------------------------------------------------------- .../apache/james/mailbox/model/MailboxId.java | 23 ++++++++++++++++++++ .../CachingMailboxSessionMapperFactory.java | 2 +- .../guava/GuavaMailboxMetadataCache.java | 2 +- .../james/mailbox/cassandra/CassandraId.java | 2 +- .../CassandraMailboxSessionMapperFactory.java | 2 +- .../org/apache/james/mailbox/hbase/HBaseId.java | 2 +- .../hbase/HBaseMailboxSessionMapperFactory.java | 2 +- .../org/apache/james/mailbox/jcr/JCRId.java | 2 +- .../jcr/JCRMailboxSessionMapperFactory.java | 2 +- .../org/apache/james/mailbox/jpa/JPAId.java | 2 +- .../jpa/JPAMailboxSessionMapperFactory.java | 2 +- .../apache/james/mailbox/maildir/MaildirId.java | 2 +- .../MaildirMailboxSessionMapperFactory.java | 2 +- .../james/mailbox/inmemory/InMemoryId.java | 2 +- .../InMemoryMailboxSessionMapperFactory.java | 2 +- .../store/MailboxSessionMapperFactory.java | 2 +- .../store/mail/model/DefaultMessageId.java | 2 ++ .../james/mailbox/store/mail/model/Mailbox.java | 1 + .../mailbox/store/mail/model/MailboxId.java | 23 -------------------- .../store/mail/model/MailboxIdDeserializer.java | 2 ++ .../store/mail/model/MailboxMessage.java | 2 ++ .../store/mail/model/impl/SimpleMailbox.java | 2 +- .../mail/model/impl/SimpleMailboxMessage.java | 2 +- .../store/search/LazyMessageSearchIndex.java | 2 +- .../StoreMailboxManagerAnnotationTest.java | 2 +- .../org/apache/james/mailbox/store/TestId.java | 2 +- .../store/mail/model/MapperProvider.java | 1 + .../store/mail/model/MessageMapperTest.java | 1 + .../store/mail/model/MessageMoveTest.java | 1 + .../mailbox/store/mail/ZooUidProvider.java | 2 +- .../mailbox/store/mail/ZooUidProviderTest.java | 2 +- .../integration/GetMessageListMethodTest.java | 2 +- .../methods/SetMessagesCreationProcessor.java | 2 +- .../jmap/utils/SortToComparatorConvertor.java | 2 +- .../james/jmap/utils/MailboxUtilsTest.java | 2 +- 35 files changed, 59 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxId.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxId.java b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxId.java new file mode 100644 index 0000000..7410b4e --- /dev/null +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MailboxId.java @@ -0,0 +1,23 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ +package org.apache.james.mailbox.model; + +public interface MailboxId { + String serialize(); +} http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxSessionMapperFactory.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxSessionMapperFactory.java index 2b9ee48..2c5d7b3 100644 --- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxSessionMapperFactory.java +++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/CachingMailboxSessionMapperFactory.java @@ -4,13 +4,13 @@ import org.apache.commons.lang.NotImplementedException; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.SubscriptionException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.NoopAttachmentMapper; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.user.SubscriptionMapper; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java ---------------------------------------------------------------------- diff --git a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java index 3a49878..3d539ad 100644 --- a/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java +++ b/mailbox/caching/src/main/java/org/apache/james/mailbox/caching/guava/GuavaMailboxMetadataCache.java @@ -2,9 +2,9 @@ package org.apache.james.mailbox.caching.guava; import org.apache.james.mailbox.caching.MailboxMetadataCache; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.model.Mailbox; -import org.apache.james.mailbox.store.mail.model.MailboxId; import com.google.common.cache.Cache; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraId.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraId.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraId.java index c8d32ac..76088d8 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraId.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraId.java @@ -20,7 +20,7 @@ package org.apache.james.mailbox.cassandra; import java.util.UUID; -import org.apache.james.mailbox.store.mail.model.MailboxId; +import org.apache.james.mailbox.model.MailboxId; import com.datastax.driver.core.utils.UUIDs; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java index 639db36..0c099c7 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java @@ -29,13 +29,13 @@ import org.apache.james.mailbox.cassandra.mail.CassandraMailboxMapper; import org.apache.james.mailbox.cassandra.mail.CassandraMessageMapper; import org.apache.james.mailbox.cassandra.user.CassandraSubscriptionMapper; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.ModSeqProvider; import org.apache.james.mailbox.store.mail.UidProvider; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.user.SubscriptionMapper; import com.datastax.driver.core.Session; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseId.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseId.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseId.java index 7528187..586bec1 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseId.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseId.java @@ -21,7 +21,7 @@ package org.apache.james.mailbox.hbase; import java.util.UUID; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.james.mailbox.store.mail.model.MailboxId; +import org.apache.james.mailbox.model.MailboxId; public class HBaseId implements MailboxId { http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java index b2972a2..864b6a0 100644 --- a/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java +++ b/mailbox/hbase/src/main/java/org/apache/james/mailbox/hbase/HBaseMailboxSessionMapperFactory.java @@ -43,6 +43,7 @@ import org.apache.james.mailbox.exception.SubscriptionException; import org.apache.james.mailbox.hbase.mail.HBaseMailboxMapper; import org.apache.james.mailbox.hbase.mail.HBaseMessageMapper; import org.apache.james.mailbox.hbase.user.HBaseSubscriptionMapper; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.apache.james.mailbox.store.mail.AttachmentMapper; @@ -51,7 +52,6 @@ import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.ModSeqProvider; import org.apache.james.mailbox.store.mail.NoopAttachmentMapper; import org.apache.james.mailbox.store.mail.UidProvider; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.user.SubscriptionMapper; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRId.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRId.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRId.java index 438068d..08851b0 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRId.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRId.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.jcr; -import org.apache.james.mailbox.store.mail.model.MailboxId; +import org.apache.james.mailbox.model.MailboxId; public class JCRId implements MailboxId { http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java index 6fb5e43..030230f 100644 --- a/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java +++ b/mailbox/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java @@ -25,6 +25,7 @@ import org.apache.james.mailbox.exception.SubscriptionException; import org.apache.james.mailbox.jcr.mail.JCRMailboxMapper; import org.apache.james.mailbox.jcr.mail.JCRMessageMapper; import org.apache.james.mailbox.jcr.user.JCRSubscriptionMapper; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.apache.james.mailbox.store.mail.AttachmentMapper; @@ -33,7 +34,6 @@ import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.ModSeqProvider; import org.apache.james.mailbox.store.mail.NoopAttachmentMapper; import org.apache.james.mailbox.store.mail.UidProvider; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.user.SubscriptionMapper; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java index 25696ad..8a5eb88 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAId.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.jpa; -import org.apache.james.mailbox.store.mail.model.MailboxId; +import org.apache.james.mailbox.model.MailboxId; public class JPAId implements MailboxId { http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java index 9485ef5..1b64f43 100644 --- a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java +++ b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java @@ -27,6 +27,7 @@ import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.jpa.mail.JPAMailboxMapper; import org.apache.james.mailbox.jpa.mail.JPAMessageMapper; import org.apache.james.mailbox.jpa.user.JPASubscriptionMapper; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.apache.james.mailbox.store.mail.AttachmentMapper; @@ -35,7 +36,6 @@ import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.ModSeqProvider; import org.apache.james.mailbox.store.mail.NoopAttachmentMapper; import org.apache.james.mailbox.store.mail.UidProvider; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.user.SubscriptionMapper; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirId.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirId.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirId.java index d60b155..2142e18 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirId.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirId.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.maildir; -import org.apache.james.mailbox.store.mail.model.MailboxId; +import org.apache.james.mailbox.model.MailboxId; public class MaildirId implements MailboxId { http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java index b129071..cd3b3df 100644 --- a/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java +++ b/mailbox/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java @@ -25,13 +25,13 @@ import org.apache.james.mailbox.exception.SubscriptionException; import org.apache.james.mailbox.maildir.mail.MaildirMailboxMapper; import org.apache.james.mailbox.maildir.mail.MaildirMessageMapper; import org.apache.james.mailbox.maildir.user.MaildirSubscriptionMapper; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.NoopAttachmentMapper; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.user.SubscriptionMapper; public class MaildirMailboxSessionMapperFactory extends http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryId.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryId.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryId.java index 46cf277..51602d5 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryId.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryId.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.inmemory; -import org.apache.james.mailbox.store.mail.model.MailboxId; +import org.apache.james.mailbox.model.MailboxId; public class InMemoryId implements MailboxId { http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java index fe70b1c..f3b0a9f 100644 --- a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java +++ b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java @@ -28,12 +28,12 @@ import org.apache.james.mailbox.inmemory.mail.InMemoryMessageMapper; import org.apache.james.mailbox.inmemory.mail.InMemoryModSeqProvider; import org.apache.james.mailbox.inmemory.mail.InMemoryUidProvider; import org.apache.james.mailbox.inmemory.user.InMemorySubscriptionMapper; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MessageMapper; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.user.SubscriptionMapper; public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFactory { http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java index 383c3a3..5c4659f 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxSessionMapperFactory.java @@ -22,6 +22,7 @@ import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.RequestAware; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.SubscriptionException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; @@ -29,7 +30,6 @@ import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.MessageMapperFactory; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.transaction.Mapper; import org.apache.james.mailbox.store.user.SubscriptionMapper; import org.apache.james.mailbox.store.user.SubscriptionMapperFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java index 3453e44..46b65fc 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/DefaultMessageId.java @@ -18,6 +18,8 @@ ****************************************************************/ package org.apache.james.mailbox.store.mail.model; +import org.apache.james.mailbox.model.MailboxId; + import com.google.common.base.Objects; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java index 5172841..e4c4092 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/Mailbox.java @@ -19,6 +19,7 @@ package org.apache.james.mailbox.store.mail.model; import org.apache.james.mailbox.model.MailboxACL; +import org.apache.james.mailbox.model.MailboxId; /** * Models long term mailbox data. http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxId.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxId.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxId.java deleted file mode 100644 index f3e27bb..0000000 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxId.java +++ /dev/null @@ -1,23 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ -package org.apache.james.mailbox.store.mail.model; - -public interface MailboxId { - String serialize(); -} http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxIdDeserializer.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxIdDeserializer.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxIdDeserializer.java index 5515f68..864be74 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxIdDeserializer.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxIdDeserializer.java @@ -19,6 +19,8 @@ package org.apache.james.mailbox.store.mail.model; +import org.apache.james.mailbox.model.MailboxId; + public interface MailboxIdDeserializer { MailboxId deserialize(String serializedMailboxId) throws MailboxIdDeserialisationException; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMessage.java index f572ce1..647de53 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMessage.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/MailboxMessage.java @@ -20,6 +20,8 @@ package org.apache.james.mailbox.store.mail.model; import javax.mail.Flags; +import org.apache.james.mailbox.model.MailboxId; + /** * A MIME message, consisting of meta-data (including MIME headers) * plus body content. In the case of multipart documents, this body content http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java index 7d70bfd..686d6a7 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailbox.java @@ -19,10 +19,10 @@ package org.apache.james.mailbox.store.mail.model.impl; import org.apache.james.mailbox.model.MailboxACL; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.SimpleMailboxACL; import org.apache.james.mailbox.store.mail.model.Mailbox; -import org.apache.james.mailbox.store.mail.model.MailboxId; public class SimpleMailbox implements Mailbox { http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java index f7c7c80..2eac432 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/SimpleMailboxMessage.java @@ -29,8 +29,8 @@ import javax.mail.util.SharedByteArrayInputStream; import org.apache.commons.io.IOUtils; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.mail.model.DelegatingMailboxMessage; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.MessageAttachment; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java index 25031e9..3d5d1ae 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/search/LazyMessageSearchIndex.java @@ -24,12 +24,12 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MessageRange; import org.apache.james.mailbox.model.SearchQuery; import org.apache.james.mailbox.model.UpdatedFlags; import org.apache.james.mailbox.store.mail.MessageMapper.FetchType; import org.apache.james.mailbox.store.mail.model.Mailbox; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.mail.model.MailboxMessage; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java index 22efc19..f662dea 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerAnnotationTest.java @@ -36,11 +36,11 @@ import org.apache.james.mailbox.acl.GroupMembershipResolver; import org.apache.james.mailbox.acl.MailboxACLResolver; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxAnnotation; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.model.Mailbox; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestId.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestId.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestId.java index 1ed9c87..aa097c7 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestId.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/TestId.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.mailbox.store; -import org.apache.james.mailbox.store.mail.model.MailboxId; +import org.apache.james.mailbox.model.MailboxId; public class TestId implements MailboxId { http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java index 72b7183..7105d74 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MapperProvider.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.store.mail.model; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.mail.AnnotationMapper; import org.apache.james.mailbox.store.mail.AttachmentMapper; import org.apache.james.mailbox.store.mail.MailboxMapper; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java index f93936d..3c22274 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java @@ -33,6 +33,7 @@ import javax.mail.util.SharedByteArrayInputStream; import org.apache.james.mailbox.FlagsBuilder; import org.apache.james.mailbox.MessageManager.FlagsUpdateMode; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageMetaData; import org.apache.james.mailbox.model.MessageRange; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java index e394d1f..8d9de5c 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMoveTest.java @@ -27,6 +27,7 @@ import javax.mail.Flags; import javax.mail.util.SharedByteArrayInputStream; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.model.MessageMetaData; import org.apache.james.mailbox.model.MessageRange; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java ---------------------------------------------------------------------- diff --git a/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java b/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java index bdabe05..2720ae3 100644 --- a/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java +++ b/mailbox/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java @@ -20,8 +20,8 @@ package org.apache.james.mailbox.store.mail; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.mail.model.Mailbox; -import org.apache.james.mailbox.store.mail.model.MailboxId; import com.google.common.base.Preconditions; import com.netflix.curator.RetryPolicy; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java ---------------------------------------------------------------------- diff --git a/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java b/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java index 046ee4f..2671c6a 100644 --- a/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java +++ b/mailbox/zoo-seq-provider/src/test/java/org/apache/james/mailbox/store/mail/ZooUidProviderTest.java @@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals; import java.util.UUID; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java index 60408ab..8a9eca5 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMessageListMethodTest.java @@ -40,8 +40,8 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.JmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.mailbox.model.MailboxConstants; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.junit.After; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java index 3e3eaff..4ffd308 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesCreationProcessor.java @@ -61,6 +61,7 @@ import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.AttachmentNotFoundException; import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.exception.MailboxNotFoundException; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; import org.apache.james.mailbox.store.mail.AttachmentMapper; @@ -68,7 +69,6 @@ import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.model.AttachmentId; import org.apache.james.mailbox.store.mail.model.Mailbox; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.MessageAttachment; import org.apache.james.mailbox.store.mail.model.impl.Cid; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortToComparatorConvertor.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortToComparatorConvertor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortToComparatorConvertor.java index 9ba867b..a523293 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortToComparatorConvertor.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/utils/SortToComparatorConvertor.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import org.apache.james.mailbox.store.mail.model.MailboxId; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/73b2da08/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java index a229b9d..4f10a04 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/utils/MailboxUtilsTest.java @@ -28,9 +28,9 @@ import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory; import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; +import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.store.mail.MailboxMapperFactory; -import org.apache.james.mailbox.store.mail.model.MailboxId; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org