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 ad...@apache.org on 2017/01/26 16:08:50 UTC
[1/3] james-project git commit: James-1920 Fix eclipse warning
Repository: james-project
Updated Branches:
refs/heads/master 7426bb624 -> d747e7d24
James-1920 Fix eclipse warning
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ab8bc8d0
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ab8bc8d0
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ab8bc8d0
Branch: refs/heads/master
Commit: ab8bc8d0e89a4d90d5b91c229fb6a03e34eabf01
Parents: 52367e7
Author: Luc DUZAN <ld...@linagora.com>
Authored: Tue Jan 24 17:37:57 2017 +0100
Committer: Luc DUZAN <ld...@linagora.com>
Committed: Thu Jan 26 11:11:02 2017 +0100
----------------------------------------------------------------------
.../james/jmap/methods/integration/SetMessagesMethodTest.java | 1 -
.../org/apache/james/jmap/methods/GetMessagesMethodTest.java | 6 ------
.../james/jmap/methods/SetMessagesCreationProcessorTest.java | 2 +-
3 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ab8bc8d0/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 d2c89e5..c043865 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
@@ -24,7 +24,6 @@ import static com.jayway.restassured.RestAssured.with;
import static com.jayway.restassured.config.EncoderConfig.encoderConfig;
import static com.jayway.restassured.config.RestAssuredConfig.newConfig;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.notIn;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.empty;
http://git-wip-us.apache.org/repos/asf/james-project/blob/ab8bc8d0/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
index dbd34ec..d690d78 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/GetMessagesMethodTest.java
@@ -25,7 +25,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.ByteArrayInputStream;
-import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
import java.util.Locale;
@@ -54,13 +53,8 @@ import org.apache.james.mailbox.inmemory.InMemoryMessageIdManager;
import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.mock.MockMailboxSession;
import org.apache.james.mailbox.model.ComposedMessageId;
-import org.apache.james.mailbox.model.FetchGroupImpl;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
-import org.apache.james.mailbox.model.MessageRange;
-import org.apache.james.mailbox.model.MessageResult;
-import org.apache.james.mailbox.store.MessageResultImpl;
-import org.apache.james.mailbox.store.mail.MessageIdMapper;
import org.assertj.core.api.Condition;
import org.assertj.core.data.MapEntry;
import org.assertj.core.groups.Tuple;
http://git-wip-us.apache.org/repos/asf/james-project/blob/ab8bc8d0/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java
index b5605bc..9abe642 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/methods/SetMessagesCreationProcessorTest.java
@@ -36,7 +36,6 @@ import java.util.stream.Stream;
import javax.mail.Flags;
import org.apache.james.jmap.exceptions.AttachmentsNotFoundException;
-import org.apache.james.jmap.exceptions.MailboxRoleNotFoundException;
import org.apache.james.jmap.methods.ValueWithId.CreationMessageEntry;
import org.apache.james.jmap.model.Attachment;
import org.apache.james.jmap.model.BlobId;
@@ -299,6 +298,7 @@ public class SetMessagesCreationProcessorTest {
this.draftsSupplier = draftsSupplier;
}
+ @Override
public Stream<MessageManager> listMailboxes(Role aRole, MailboxSession session) {
if (aRole.equals(Role.OUTBOX)) {
return outboxSupplier.get().map(o -> Stream.of(o)).orElse(Stream.empty());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/3] james-project git commit: Merge remote-tracking branch
'lduzan/James-1920_implement_move_to_trash'
Posted by ad...@apache.org.
Merge remote-tracking branch 'lduzan/James-1920_implement_move_to_trash'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d747e7d2
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d747e7d2
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d747e7d2
Branch: refs/heads/master
Commit: d747e7d246923c0ea2aa8ebc35d670e7d8129a9d
Parents: 7426bb6 ab8bc8d
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Jan 26 17:08:14 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Thu Jan 26 17:08:14 2017 +0100
----------------------------------------------------------------------
.../integration/SetMessagesMethodTest.java | 9 +++++----
.../methods/SetMessagesUpdateProcessor.java | 21 ++------------------
.../SetMessagesCreationProcessorTest.java | 1 +
3 files changed, 8 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d747e7d2/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
----------------------------------------------------------------------
diff --cc server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
index 90aa5ff,c188d28..faf228c
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
@@@ -35,8 -33,8 +33,7 @@@ import org.apache.james.jmap.model.SetE
import org.apache.james.jmap.model.SetMessagesRequest;
import org.apache.james.jmap.model.SetMessagesResponse;
import org.apache.james.jmap.model.UpdateMessagePatch;
- import org.apache.james.jmap.model.mailbox.Role;
import org.apache.james.jmap.utils.SystemMailboxesProvider;
-import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageIdManager;
import org.apache.james.mailbox.MessageManager;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/3] james-project git commit: James-1920 Make move to trash like
move to any other mailbox
Posted by ad...@apache.org.
James-1920 Make move to trash like move to any other mailbox
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/52367e7d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/52367e7d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/52367e7d
Branch: refs/heads/master
Commit: 52367e7d5b58d9efc0f41f25c6b66bae7a3bd769
Parents: f2d4d61
Author: Luc DUZAN <ld...@linagora.com>
Authored: Tue Jan 24 17:27:57 2017 +0100
Committer: Luc DUZAN <ld...@linagora.com>
Committed: Thu Jan 26 11:11:02 2017 +0100
----------------------------------------------------------------------
.../integration/SetMessagesMethodTest.java | 9 +++++----
.../methods/SetMessagesUpdateProcessor.java | 21 ++------------------
2 files changed, 7 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/52367e7d/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 671f299..d2c89e5 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
@@ -2048,7 +2048,7 @@ public abstract class SetMessagesMethodTest {
}
@Test
- public void moveToTrashIsNotYetSupported() throws Exception {
+ public void setMessagesShouldWorkForMoveToTrash() throws Exception {
String trashId = jmapServer.serverProbe().getMailbox("#private", USERNAME, "trash").getMailboxId().serialize();
ZonedDateTime dateTime = ZonedDateTime.parse("2014-10-30T14:12:00Z");
@@ -2074,10 +2074,11 @@ public abstract class SetMessagesMethodTest {
.when()
.post("/jmap")
.then()
- .log().ifValidationFails()
.statusCode(200)
- .body(NAME, equalTo("error"))
- .body(ARGUMENTS + ".type", equalTo("Not yet implemented"));
+ .log().ifValidationFails()
+ .body(NAME, equalTo("messagesSet"))
+ .body(ARGUMENTS + ".updated[0]", equalTo(messageToMoveId))
+ .body(ARGUMENTS + ".updated", hasSize(1));
}
@Test
http://git-wip-us.apache.org/repos/asf/james-project/blob/52367e7d/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
index aaae397..c188d28 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/methods/SetMessagesUpdateProcessor.java
@@ -28,14 +28,11 @@ import java.util.stream.Stream;
import javax.inject.Inject;
import javax.mail.Flags;
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.james.jmap.exceptions.MailboxRoleNotFoundException;
import org.apache.james.jmap.model.MessageProperties;
import org.apache.james.jmap.model.SetError;
import org.apache.james.jmap.model.SetMessagesRequest;
import org.apache.james.jmap.model.SetMessagesResponse;
import org.apache.james.jmap.model.UpdateMessagePatch;
-import org.apache.james.jmap.model.mailbox.Role;
import org.apache.james.jmap.utils.SystemMailboxesProvider;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxSession;
@@ -80,6 +77,7 @@ public class SetMessagesUpdateProcessor implements SetMessagesProcessor {
this.systemMailboxesProvider = systemMailboxesProvider;
}
+ @Override
public SetMessagesResponse process(SetMessagesRequest request, MailboxSession mailboxSession) {
SetMessagesResponse.Builder responseBuilder = SetMessagesResponse.builder();
request.buildUpdatePatches(updatePatchConverter).forEach( (id, patch) -> {
@@ -112,7 +110,7 @@ public class SetMessagesUpdateProcessor implements SetMessagesProcessor {
} catch (MailboxException e) {
handleMessageUpdateException(messageId, builder, e);
}
-
+
}
private Stream<MailboxException> updateFlags(MessageId messageId, UpdateMessagePatch updateMessagePatch, MailboxSession mailboxSession, MessageResult messageResult) {
@@ -133,25 +131,10 @@ public class SetMessagesUpdateProcessor implements SetMessagesProcessor {
.map(mailboxId -> mailboxIdFactory.fromString(mailboxId))
.collect(Guavate.toImmutableList());
- if (isMoveToTrash(mailboxSession, mailboxIds)) {
- throw new NotImplementedException("Do not support move to trash");
- }
-
messageIdManager.setInMailboxes(messageId, mailboxIds, mailboxSession);
}
}
- private boolean isMoveToTrash(MailboxSession mailboxSession, List<MailboxId> mailboxIds) throws MailboxException {
- try {
- return mailboxIds.size() == 1
- && mailboxIds.get(0)
- .equals(systemMailboxesProvider.findMailbox(Role.TRASH, mailboxSession).getId());
- } catch (MailboxRoleNotFoundException e) {
- LOGGER.debug("Unable to find Trash mailbox for user: " + mailboxSession.getUser().getUserName(), e);
- return false;
- }
- }
-
private void addMessageIdNotFoundToResponse(MessageId messageId, SetMessagesResponse.Builder builder) {
builder.notUpdated(ImmutableMap.of(messageId,
SetError.builder()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org