You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/06/19 03:23:21 UTC
[james-project] branch master updated (4c9d1c6 -> b128301)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 4c9d1c6 Merge remote-tracking branch 'benoit/JAMES-2630-fix'
new d4d2d0b JAMES-2790 Add a role for Restored-Messages mailbox
new fe5f880 JAMES-2790 Small refactor on vault restore with new default mailbox Restored-Messages
new 935a377 JAMES-2790 Add a jmap integration test for the creation of Restored-Messages mailbox after a vault restore
new a355acf JAMES-2790 Rename correctly variable
new 24ec8b2 JAMES-2790 Role is case sensitive
new d6ad3b4 MPT-43 Increase wait time in DeploymentValidation script
new b128301 JAMES-2793 Incorrectly referenced the classes
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/james/mailbox/DefaultMailboxes.java | 1 +
.../main/java/org/apache/james/mailbox/Role.java | 4 ++-
.../java/org/apache/james/mailbox/RoleTest.java | 18 +++++++++++-
.../james/imap/scripts/ValidateDeployment.test | 4 +--
server/app/src/main/resources/log4j.properties | 34 +++++++++++-----------
.../org/apache/james/jmap/JmapCommonRequests.java | 6 ++--
.../integration/DeletedMessagesVaultTest.java | 23 +++++++++++++++
.../apache/james/jmap/model/mailbox/SortOrder.java | 1 +
.../james/jmap/methods/GetMailboxesMethodTest.java | 2 ++
.../webadmin/vault/routes/RestoreService.java | 5 ++--
.../routes/DeletedMessagesVaultRoutesTest.java | 6 ++--
11 files changed, 74 insertions(+), 30 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 06/07: MPT-43 Increase wait time in
DeploymentValidation script
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit d6ad3b4fde95c8be1059304fc9dfaef88cf0c90a
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Jun 17 15:04:22 2019 +0700
MPT-43 Increase wait time in DeploymentValidation script
---
.../resources/org/apache/james/imap/scripts/ValidateDeployment.test | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/resources/org/apache/james/imap/scripts/ValidateDeployment.test b/mpt/impl/imap-mailbox/external-james/src/test/resources/org/apache/james/imap/scripts/ValidateDeployment.test
index 90a8c22..f768cd3 100644
--- a/mpt/impl/imap-mailbox/external-james/src/test/resources/org/apache/james/imap/scripts/ValidateDeployment.test
+++ b/mpt/impl/imap-mailbox/external-james/src/test/resources/org/apache/james/imap/scripts/ValidateDeployment.test
@@ -497,7 +497,7 @@ S: b OK STORE completed.
# Indexation may be asynchronous
LOG INFO Waiting for indexation
-WAIT 5000
+WAIT 10000
C: c SEARCH FLAGGED
S: \* SEARCH 1 2 3 4
@@ -508,7 +508,7 @@ S: d OK STORE completed.
# Indexation may be asynchronous
LOG INFO Waiting for indexation
-WAIT 5000
+WAIT 10000
C: e SEARCH FLAGGED
S: \* SEARCH 1 2
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 03/07: JAMES-2790 Add a jmap integration test for
the creation of Restored-Messages mailbox after a vault restore
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 935a37747d7fa2329f58ed7d54b0219b870e1108
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Fri Jun 14 17:51:11 2019 +0700
JAMES-2790 Add a jmap integration test for the creation of Restored-Messages mailbox after a vault restore
---
.../org/apache/james/jmap/JmapCommonRequests.java | 2 +-
.../integration/DeletedMessagesVaultTest.java | 23 ++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
index 7dd4c14..f7e4e49 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
@@ -62,7 +62,7 @@ public class JmapCommonRequests {
public static List<Map<String, String>> getAllMailboxesIds(AccessToken accessToken) {
return with()
.header("Authorization", accessToken.serialize())
- .body("[[\"getMailboxes\", {\"properties\": [\"role\", \"id\"]}, \"#0\"]]")
+ .body("[[\"getMailboxes\", {\"properties\": [\"role\", \"name\", \"id\"]}, \"#0\"]]")
.post("/jmap")
.andReturn()
.body()
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
index 9c62274..f8d8e94 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
@@ -28,6 +28,7 @@ import static org.apache.james.jmap.DeletedMessagesVaultRequests.purgeVault;
import static org.apache.james.jmap.DeletedMessagesVaultRequests.restoreMessagesForUserWithQuery;
import static org.apache.james.jmap.HttpJmapAuthentication.authenticateJamesUser;
import static org.apache.james.jmap.JmapCommonRequests.deleteMessages;
+import static org.apache.james.jmap.JmapCommonRequests.getAllMailboxesIds;
import static org.apache.james.jmap.JmapCommonRequests.getLastMessageId;
import static org.apache.james.jmap.JmapCommonRequests.getOutboxId;
import static org.apache.james.jmap.JmapCommonRequests.listMessageIdsForAccount;
@@ -56,6 +57,7 @@ import org.apache.james.jmap.ExportRequest;
import org.apache.james.jmap.api.access.AccessToken;
import org.apache.james.jmap.categories.BasicFeature;
import org.apache.james.mailbox.DefaultMailboxes;
+import org.apache.james.mailbox.Role;
import org.apache.james.mailbox.backup.ZipAssert;
import org.apache.james.mailbox.backup.ZipAssert.EntryChecks;
import org.apache.james.mailbox.model.MailboxId;
@@ -240,6 +242,20 @@ public abstract class DeletedMessagesVaultTest {
}
@Test
+ public void restoreShouldCreateRestoreMessagesMailbox() {
+ bartSendMessageToHomer();
+ WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 1);
+
+ homerDeletesMessages(listMessageIdsForAccount(homerAccessToken));
+ WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 0);
+
+ restoreAllMessagesOfHomer();
+ WAIT_TWO_MINUTES.until(() -> listMessageIdsForAccount(homerAccessToken).size() == 1);
+
+ assertThat(homerHasMailboxWithRole(Role.RESTORED_MESSAGES)).isTrue();
+ }
+
+ @Test
public void postShouldRestoreMatchingMessages() {
bartSendMessageToHomerWithSubject("aaaaa");
bartSendMessageToHomerWithSubject("bbbbb");
@@ -836,4 +852,11 @@ public abstract class DeletedMessagesVaultTest {
.when()
.post("/jmap");
}
+
+ private boolean homerHasMailboxWithRole(Role role) {
+ return getAllMailboxesIds(homerAccessToken).stream()
+ .filter(mailbox -> mailbox.get("role") != null)
+ .anyMatch(mailbox -> mailbox.get("role").equalsIgnoreCase(role.serialize())
+ && mailbox.get("name").equalsIgnoreCase(role.getDefaultMailbox()));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 05/07: JAMES-2790 Role is case sensitive
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 24ec8b24d046a3545b70266df751817cb26ff0eb
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Mon Jun 17 14:05:25 2019 +0700
JAMES-2790 Role is case sensitive
---
.../src/test/java/org/apache/james/jmap/JmapCommonRequests.java | 2 +-
.../james/jmap/methods/integration/DeletedMessagesVaultTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
index 9fdc79d..4e55f4d 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
@@ -54,7 +54,7 @@ public class JmapCommonRequests {
public static String getMailboxId(AccessToken accessToken, Role role) {
return getAllMailboxesIds(accessToken).stream()
- .filter(mailbox -> mailbox.get("role").equalsIgnoreCase(role.serialize()))
+ .filter(mailbox -> mailbox.get("role").equals(role.serialize()))
.map(mailbox -> mailbox.get("id"))
.findFirst().get();
}
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
index f8d8e94..62e52ee 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/DeletedMessagesVaultTest.java
@@ -856,7 +856,7 @@ public abstract class DeletedMessagesVaultTest {
private boolean homerHasMailboxWithRole(Role role) {
return getAllMailboxesIds(homerAccessToken).stream()
.filter(mailbox -> mailbox.get("role") != null)
- .anyMatch(mailbox -> mailbox.get("role").equalsIgnoreCase(role.serialize())
- && mailbox.get("name").equalsIgnoreCase(role.getDefaultMailbox()));
+ .anyMatch(mailbox -> mailbox.get("role").equals(role.serialize())
+ && mailbox.get("name").equals(role.getDefaultMailbox()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 04/07: JAMES-2790 Rename correctly variable
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit a355acf7fe3d944b0cf4bdb3f9f958ed17ccd7c4
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Mon Jun 17 11:13:24 2019 +0700
JAMES-2790 Rename correctly variable
---
.../src/test/java/org/apache/james/jmap/JmapCommonRequests.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
index f7e4e49..9fdc79d 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JmapCommonRequests.java
@@ -54,8 +54,8 @@ public class JmapCommonRequests {
public static String getMailboxId(AccessToken accessToken, Role role) {
return getAllMailboxesIds(accessToken).stream()
- .filter(x -> x.get("role").equalsIgnoreCase(role.serialize()))
- .map(x -> x.get("id"))
+ .filter(mailbox -> mailbox.get("role").equalsIgnoreCase(role.serialize()))
+ .map(mailbox -> mailbox.get("id"))
.findFirst().get();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 02/07: JAMES-2790 Small refactor on vault restore
with new default mailbox Restored-Messages
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit fe5f8802db2585d63363739ab49f69d12f7565c3
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Fri Jun 14 14:38:00 2019 +0700
JAMES-2790 Small refactor on vault restore with new default mailbox Restored-Messages
---
.../java/org/apache/james/webadmin/vault/routes/RestoreService.java | 5 ++---
.../james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java
index aa6efef..064a392 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java
@@ -26,6 +26,7 @@ import static org.apache.james.webadmin.vault.routes.RestoreService.RestoreResul
import javax.inject.Inject;
import org.apache.james.core.User;
+import org.apache.james.mailbox.DefaultMailboxes;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
@@ -54,8 +55,6 @@ class RestoreService {
private static final Logger LOGGER = LoggerFactory.getLogger(RestoreService.class);
- static final String RESTORE_MAILBOX_NAME = "Restored-Messages";
-
private final DeletedMessageVault deletedMessageVault;
private final MailboxManager mailboxManager;
@@ -92,7 +91,7 @@ class RestoreService {
}
private MessageManager restoreMailboxManager(MailboxSession session) throws MailboxException {
- MailboxPath restoreMailbox = MailboxPath.forUser(session.getUser().asString(), RESTORE_MAILBOX_NAME);
+ MailboxPath restoreMailbox = MailboxPath.forUser(session.getUser().asString(), DefaultMailboxes.RESTORED_MESSAGES);
try {
return mailboxManager.getMailbox(restoreMailbox, session);
} catch (MailboxNotFoundException e) {
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index 3df3aa4..74aa72d 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -40,7 +40,6 @@ import static org.apache.james.webadmin.Constants.SEPARATOR;
import static org.apache.james.webadmin.vault.routes.DeletedMessagesVaultRoutes.MESSAGE_PATH_PARAM;
import static org.apache.james.webadmin.vault.routes.DeletedMessagesVaultRoutes.USERS;
import static org.apache.james.webadmin.vault.routes.DeletedMessagesVaultRoutes.USER_PATH;
-import static org.apache.james.webadmin.vault.routes.RestoreService.RESTORE_MAILBOX_NAME;
import static org.apache.mailet.base.MailAddressFixture.RECIPIENT1;
import static org.apache.mailet.base.MailAddressFixture.RECIPIENT2;
import static org.apache.mailet.base.MailAddressFixture.RECIPIENT3;
@@ -83,6 +82,7 @@ import org.apache.james.core.User;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.domainlist.lib.DomainListConfiguration;
import org.apache.james.domainlist.memory.MemoryDomainList;
+import org.apache.james.mailbox.DefaultMailboxes;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
import org.apache.james.mailbox.exception.MailboxException;
@@ -1673,7 +1673,7 @@ class DeletedMessagesVaultRoutesTest {
@Test
void restoreShouldNotDeleteExistingMessagesInTheUserMailbox() throws Exception {
MailboxSession session = mailboxManager.createSystemSession(USER.asString());
- MailboxPath restoreMailboxPath = MailboxPath.forUser(USER.asString(), RESTORE_MAILBOX_NAME);
+ MailboxPath restoreMailboxPath = MailboxPath.forUser(USER.asString(), DefaultMailboxes.RESTORED_MESSAGES);
mailboxManager.createMailbox(restoreMailboxPath, session);
MessageManager messageManager = mailboxManager.getMailbox(restoreMailboxPath, session);
messageManager.appendMessage(
@@ -2294,7 +2294,7 @@ class DeletedMessagesVaultRoutesTest {
private List<MessageResult> restoreMailboxMessages(User user) throws Exception {
MailboxSession session = mailboxManager.createSystemSession(user.asString());
- MessageManager messageManager = mailboxManager.getMailbox(MailboxPath.forUser(user.asString(), RESTORE_MAILBOX_NAME), session);
+ MessageManager messageManager = mailboxManager.getMailbox(MailboxPath.forUser(user.asString(), DefaultMailboxes.RESTORED_MESSAGES), session);
return ImmutableList.copyOf(messageManager.getMessages(MessageRange.all(), FetchGroupImpl.MINIMAL, session));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 01/07: JAMES-2790 Add a role for Restored-Messages
mailbox
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit d4d2d0b996ea7e3c37f409cd6f4203015bb1d589
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Fri Jun 14 14:35:39 2019 +0700
JAMES-2790 Add a role for Restored-Messages mailbox
---
.../org/apache/james/mailbox/DefaultMailboxes.java | 1 +
.../src/main/java/org/apache/james/mailbox/Role.java | 4 +++-
.../test/java/org/apache/james/mailbox/RoleTest.java | 18 +++++++++++++++++-
.../org/apache/james/jmap/model/mailbox/SortOrder.java | 1 +
.../james/jmap/methods/GetMailboxesMethodTest.java | 2 ++
5 files changed, 24 insertions(+), 2 deletions(-)
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
index 0fa4401..fabc8ff 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/DefaultMailboxes.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/DefaultMailboxes.java
@@ -34,6 +34,7 @@ public interface DefaultMailboxes {
String ARCHIVE = "Archive";
String SPAM = "Spam";
String TEMPLATES = "Templates";
+ String RESTORED_MESSAGES = "Restored-Messages";
List<String> DEFAULT_MAILBOXES = ImmutableList.of(INBOX, OUTBOX, SENT, TRASH, DRAFTS, SPAM);
}
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/Role.java b/mailbox/api/src/main/java/org/apache/james/mailbox/Role.java
index 675b91b..a6ccfb0 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/Role.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/Role.java
@@ -42,9 +42,11 @@ public class Role {
public static final Role ARCHIVE = new Role("archive", DefaultMailboxes.ARCHIVE, CASE_SENSITIVE_COMPARATOR);
public static final Role SPAM = new Role("spam", DefaultMailboxes.SPAM, CASE_SENSITIVE_COMPARATOR);
public static final Role TEMPLATES = new Role("templates", DefaultMailboxes.TEMPLATES, CASE_SENSITIVE_COMPARATOR);
+ public static final Role RESTORED_MESSAGES =
+ new Role("restored messages", DefaultMailboxes.RESTORED_MESSAGES, CASE_SENSITIVE_COMPARATOR);
private static final List<Role> ROLES =
- ImmutableList.<Role>of(INBOX, DRAFTS, OUTBOX, SENT, TRASH, ARCHIVE, SPAM, TEMPLATES);
+ ImmutableList.<Role>of(INBOX, DRAFTS, OUTBOX, SENT, TRASH, ARCHIVE, SPAM, TEMPLATES, RESTORED_MESSAGES);
private final String name;
private final String defaultMailbox;
diff --git a/mailbox/api/src/test/java/org/apache/james/mailbox/RoleTest.java b/mailbox/api/src/test/java/org/apache/james/mailbox/RoleTest.java
index 134ecf3..6352a07 100644
--- a/mailbox/api/src/test/java/org/apache/james/mailbox/RoleTest.java
+++ b/mailbox/api/src/test/java/org/apache/james/mailbox/RoleTest.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Locale;
import java.util.Optional;
-import org.apache.james.mailbox.Role;
import org.junit.Test;
public class RoleTest {
@@ -96,6 +95,11 @@ public class RoleTest {
}
@Test
+ public void isSystemRoleShouldBeTrueWhenRestoredMessages() {
+ assertThat(Role.RESTORED_MESSAGES.isSystemRole()).isTrue();
+ }
+
+ @Test
public void isSystemRoleShouldBeFalseWhenUserDefinedRole() {
Role userRole = Role.from(Role.USER_DEFINED_ROLE_PREFIX + "myRole").get();
assertThat(userRole.isSystemRole()).isFalse();
@@ -160,4 +164,16 @@ public class RoleTest {
Optional<Role> role = Role.from("TrAsH");
assertThat(role).isEmpty();
}
+
+ @Test
+ public void theRestoredMessagesMailboxNameShouldBeASystemMailbox() {
+ Role role = Role.from("Restored-Messages").get();
+ assertThat(role.isSystemRole()).isTrue();
+ }
+
+ @Test
+ public void theReStOrEdMeSsAgEsMailboxNameShouldNotBeASystemMailbox() {
+ Optional<Role> role = Role.from("ReStOrEd-MeSsAgEs");
+ assertThat(role).isEmpty();
+ }
}
\ No newline at end of file
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/SortOrder.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/SortOrder.java
index 27c2a65..7442a75 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/SortOrder.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/mailbox/SortOrder.java
@@ -41,6 +41,7 @@ public class SortOrder implements Comparable<SortOrder> {
.put(Role.TRASH, SortOrder.of(60))
.put(Role.SPAM, SortOrder.of(70))
.put(Role.TEMPLATES, SortOrder.of(80))
+ .put(Role.RESTORED_MESSAGES, SortOrder.of(90))
.build();
private static Optional<SortOrder> getDefaultSortOrder(Role role) {
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
index e5c2c31..ae0f9aa 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMailboxesMethodTest.java
@@ -380,6 +380,7 @@ public class GetMailboxesMethodTest {
mailboxManager.createMailbox(MailboxPath.forUser(USERNAME, "Trash"), mailboxSession);
mailboxManager.createMailbox(MailboxPath.forUser(USERNAME, "Spam"), mailboxSession);
mailboxManager.createMailbox(MailboxPath.forUser(USERNAME, "Templates"), mailboxSession);
+ mailboxManager.createMailbox(MailboxPath.forUser(USERNAME, "Restored-Messages"), mailboxSession);
mailboxManager.createMailbox(MailboxPath.forUser(USERNAME, "WITHOUT ROLE"), mailboxSession);
GetMailboxesRequest getMailboxesRequest = GetMailboxesRequest.builder()
@@ -403,6 +404,7 @@ public class GetMailboxesMethodTest {
Tuple.tuple("Trash", Optional.of(Role.TRASH)),
Tuple.tuple("Spam", Optional.of(Role.SPAM)),
Tuple.tuple("Templates", Optional.of(Role.TEMPLATES)),
+ Tuple.tuple("Restored-Messages", Optional.of(Role.RESTORED_MESSAGES)),
Tuple.tuple("WITHOUT ROLE", Optional.empty()));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[james-project] 07/07: JAMES-2793 Incorrectly referenced the classes
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b12830145c47edcca39c49548258aa32d331ad47
Author: Brent Livingston <bl...@ezinedirector.com>
AuthorDate: Mon Jun 17 20:32:45 2019 -0500
JAMES-2793 Incorrectly referenced the classes
log4j.properties incorrectly references the classes related to Apache James. For example, log4j.logger.james.mailetcontainer=DEBUG should be log4j.logger.org.apache.james.mailetcontainer=DEBUG. Therefore, the default settings do not log as expected.
---
server/app/src/main/resources/log4j.properties | 34 +++++++++++++-------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/server/app/src/main/resources/log4j.properties b/server/app/src/main/resources/log4j.properties
index 926625e..351c673 100644
--- a/server/app/src/main/resources/log4j.properties
+++ b/server/app/src/main/resources/log4j.properties
@@ -115,23 +115,23 @@ log4j.logger.org.apache.camel=WARN, CONS, FILE
log4j.logger.org.springframework=WARN, CONS, FILE
log4j.logger.org.apache.james=INFO, CONS, FILE
-log4j.logger.james=WARN, CONS, FILE
+log4j.logger.org.apache.james=WARN, CONS, FILE
log4j.logger=DEBUG, CONS, FILE
-log4j.logger.james.mailboxmanager=INFO, MAILBOXMANAGER
-log4j.logger.james.imapserver=INFO, IMAPSERVER
-log4j.logger.james.mailetcontainer=INFO, MAILETCONTAINER
-log4j.logger.james.mailetcontext=INFO, MAILETCONTAINER
-log4j.logger.james.mailspooler=INFO, MAILETCONTAINER
-log4j.logger.james.mailprocessor=INFO, MAILETCONTAINER
-log4j.logger.james.dnsservice=INFO, DNSSERVICE
-log4j.logger.james.pop3server=INFO, POP3SERVER
-log4j.logger.james.smtpserver=INFO, SMTPSERVER
-log4j.logger.james.lmtpserver=INFO, LMTPSERVER
-log4j.logger.james.mailrepositorystore=INFO, MAILREPOSITORYSTORE
-log4j.logger.james.usersrepository=INFO, USERSREPOSITORY
-log4j.logger.james.fetchmail=INFO, FETCHMAIL
-log4j.logger.james.domainlist=INFO, DOMAINLIST
-log4j.logger.james.virtualusertable=INFO, VIRTUALUSERTABLE
-log4j.logger.james.mailqueuefactory=INFO, MAILQUEUEFACTORY
+log4j.logger.org.apache.james.mailboxmanager=INFO, MAILBOXMANAGER
+log4j.logger.org.apache.james.imapserver=INFO, IMAPSERVER
+log4j.logger.org.apache.james.mailetcontainer=INFO, MAILETCONTAINER
+log4j.logger.org.apache.james.mailetcontext=INFO, MAILETCONTAINER
+log4j.logger.org.apache.james.mailspooler=INFO, MAILETCONTAINER
+log4j.logger.org.apache.james.mailprocessor=INFO, MAILETCONTAINER
+log4j.logger.org.apache.james.dnsservice=INFO, DNSSERVICE
+log4j.logger.org.apache.james.pop3server=INFO, POP3SERVER
+log4j.logger.org.apache.james.smtpserver=INFO, SMTPSERVER
+log4j.logger.org.apache.james.lmtpserver=INFO, LMTPSERVER
+log4j.logger.org.apache.james.mailrepositorystore=INFO, MAILREPOSITORYSTORE
+log4j.logger.org.apache.james.usersrepository=INFO, USERSREPOSITORY
+log4j.logger.org.apache.james.fetchmail=INFO, FETCHMAIL
+log4j.logger.org.apache.james.domainlist=INFO, DOMAINLIST
+log4j.logger.org.apache.james.virtualusertable=INFO, VIRTUALUSERTABLE
+log4j.logger.org.apache.james.mailqueuefactory=INFO, MAILQUEUEFACTORY
log4j.logger.etm.core.monitor.EtmMonitor= INFO, CONS, FILE
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org