Repository: james-project Updated Branches: refs/heads/master fc5c1eaaf -> 3dbfd86b8
JAMES-2341 Move DefaultMailboxes at API level Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f8c62f29 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f8c62f29 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f8c62f29 Branch: refs/heads/master Commit: f8c62f29fc4f157feb6cbe6732adb037d3c4b557 Parents: 58c2deb Author: Antoine Duprat <adup...@linagora.com> Authored: Mon Feb 26 13:49:19 2018 +0100 Committer: Antoine Duprat <adup...@linagora.com> Committed: Wed Feb 28 13:29:31 2018 +0100 ---------------------------------------------------------------------- .../apache/james/mailbox/DefaultMailboxes.java | 39 ++++++++++++++++++++ .../org/apache/james/jmap/ProvisioningTest.java | 1 + .../james/jmap/VacationIntegrationTest.java | 1 + .../jmap/VacationRelayIntegrationTest.java | 1 + .../integration/GetMailboxesMethodTest.java | 2 +- .../integration/SetMailboxesMethodTest.java | 2 +- .../integration/SetMessagesMethodTest.java | 2 +- .../org/apache/james/jmap/DefaultMailboxes.java | 39 -------------------- .../DefaultMailboxesProvisioningFilter.java | 1 + .../apache/james/jmap/model/mailbox/Role.java | 2 +- .../DefaultMailboxesProvisioningFilterTest.java | 1 + .../jmap/send/PostDequeueDecoratorTest.java | 2 +- 12 files changed, 49 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/mailbox/api/src/main/java/org/apache/james/mailbox/DefaultMailboxes.java ---------------------------------------------------------------------- diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/DefaultMailboxes.java b/mailbox/api/src/main/java/org/apache/james/mailbox/DefaultMailboxes.java new file mode 100644 index 0000000..0fa4401 --- /dev/null +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/DefaultMailboxes.java @@ -0,0 +1,39 @@ +/**************************************************************** + * 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; + +import java.util.List; + +import org.apache.james.mailbox.model.MailboxConstants; + +import com.google.common.collect.ImmutableList; + +public interface DefaultMailboxes { + + String INBOX = MailboxConstants.INBOX; + String OUTBOX = "Outbox"; + String SENT = "Sent"; + String TRASH = "Trash"; + String DRAFTS = "Drafts"; + String ARCHIVE = "Archive"; + String SPAM = "Spam"; + String TEMPLATES = "Templates"; + + List<String> DEFAULT_MAILBOXES = ImmutableList.of(INBOX, OUTBOX, SENT, TRASH, DRAFTS, SPAM); +} http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java index 805a0c9..67e40f8 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java @@ -33,6 +33,7 @@ import java.util.concurrent.TimeUnit; import org.apache.http.client.utils.URIBuilder; import org.apache.james.GuiceJamesServer; +import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.util.concurrency.ConcurrentTestRunner; import org.apache.james.utils.DataProbeImpl; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java index 2eb754c..2462081 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java @@ -37,6 +37,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.VacationPatch; +import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java index eb1c812..f430748 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java @@ -29,6 +29,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.dnsservice.api.InMemoryDNSService; import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.VacationPatch; +import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java index 243156a..f0cfda7 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetMailboxesMethodTest.java @@ -45,12 +45,12 @@ import javax.mail.Flags; import org.apache.http.client.utils.URIBuilder; import org.apache.james.GuiceJamesServer; -import org.apache.james.jmap.DefaultMailboxes; import org.apache.james.jmap.HttpJmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.model.mailbox.MailboxNamespace; import org.apache.james.mailbox.model.MailboxACL.Rfc4314Rights; import org.apache.james.mailbox.model.MailboxACL.Right; +import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java index 8127764..addba8a 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMailboxesMethodTest.java @@ -43,9 +43,9 @@ import java.nio.charset.StandardCharsets; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.utils.URIBuilder; import org.apache.james.GuiceJamesServer; -import org.apache.james.jmap.DefaultMailboxes; import org.apache.james.jmap.HttpJmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; +import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxACL.Right; import org.apache.james.mailbox.model.MailboxConstants; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java index cb9a414..c63b022 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetMessagesMethodTest.java @@ -56,10 +56,10 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.io.IOUtils; import org.apache.http.client.utils.URIBuilder; import org.apache.james.GuiceJamesServer; -import org.apache.james.jmap.DefaultMailboxes; import org.apache.james.jmap.HttpJmapAuthentication; import org.apache.james.jmap.api.access.AccessToken; import org.apache.james.jmap.model.mailbox.Role; +import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.FlagsBuilder; import org.apache.james.mailbox.MailboxListener; import org.apache.james.mailbox.exception.MailboxException; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxes.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxes.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxes.java deleted file mode 100644 index 9ae4234..0000000 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxes.java +++ /dev/null @@ -1,39 +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.jmap; - -import java.util.List; - -import org.apache.james.mailbox.model.MailboxConstants; - -import com.google.common.collect.ImmutableList; - -public interface DefaultMailboxes { - - String INBOX = MailboxConstants.INBOX; - String OUTBOX = "Outbox"; - String SENT = "Sent"; - String TRASH = "Trash"; - String DRAFTS = "Drafts"; - String ARCHIVE = "Archive"; - String SPAM = "Spam"; - String TEMPLATES = "Templates"; - - List<String> DEFAULT_MAILBOXES = ImmutableList.of(INBOX, OUTBOX, SENT, TRASH, DRAFTS, SPAM); -} http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java index 2c62b47..aa6099f 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilter.java @@ -30,6 +30,7 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSession.User; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java index 44115e3..8f7ee17 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/Role.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Optional; import java.util.function.BiFunction; -import org.apache.james.jmap.DefaultMailboxes; +import org.apache.james.mailbox.DefaultMailboxes; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java index 6653417..08522f1 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/DefaultMailboxesProvisioningFilterTest.java @@ -22,6 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.TimeUnit; +import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.inmemory.InMemoryMailboxManager; http://git-wip-us.apache.org/repos/asf/james-project/blob/f8c62f29/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java index 2c608ba..4dada28 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/send/PostDequeueDecoratorTest.java @@ -33,9 +33,9 @@ import java.util.Date; import javax.mail.Flags; import javax.mail.Flags.Flag; -import org.apache.james.jmap.DefaultMailboxes; import org.apache.james.jmap.exceptions.MailboxRoleNotFoundException; import org.apache.james.jmap.utils.SystemMailboxesProviderImpl; +import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MessageIdManager; import org.apache.james.mailbox.MessageManager; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
