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 ro...@apache.org on 2017/01/10 10:24:22 UTC
[1/2] james-project git commit: JAMES-1907 fix issue with eclipse
4.6.2
Repository: james-project
Updated Branches:
refs/heads/master 97de26382 -> 3b6c5e00d
JAMES-1907 fix issue with eclipse 4.6.2
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6a3c0100
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6a3c0100
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6a3c0100
Branch: refs/heads/master
Commit: 6a3c0100a28f20c055e3d622ab3d41819883e163
Parents: 0a11a44
Author: Luc DUZAN <ld...@linagora.com>
Authored: Mon Jan 9 14:45:52 2017 +0100
Committer: Luc DUZAN <ld...@linagora.com>
Committed: Mon Jan 9 14:45:52 2017 +0100
----------------------------------------------------------------------
.../james/mailbox/cassandra/mail/CassandraMessageMapper.java | 2 +-
.../james/jmap/methods/integration/SetMessagesMethodTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/6a3c0100/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
index 5817bcc..dc183f2 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
@@ -236,7 +236,7 @@ public class CassandraMessageMapper implements MessageMapper {
.map(message -> updateFlagsOnMessage(mailbox, flagUpdateCalculator, message))
.filter(Optional::isPresent)
.map(Optional::get)
- .map((updatedFlags) -> manageUnseenMessageCounts(mailbox, updatedFlags.getOldFlags(), updatedFlags.getNewFlags())
+ .map((UpdatedFlags updatedFlags) -> manageUnseenMessageCounts(mailbox, updatedFlags.getOldFlags(), updatedFlags.getNewFlags())
.thenApply(voidValue -> updatedFlags))
.map(CompletableFuture::join)
.collect(Collectors.toList()) // This collect is here as we need to consume all the stream before returning result
http://git-wip-us.apache.org/repos/asf/james-project/blob/6a3c0100/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 bc2c17b..1cbfa7a 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
@@ -2515,7 +2515,7 @@ public abstract class SetMessagesMethodTest {
private Matcher<Map<? extends String, ? extends String>> allHeadersMatcher(ImmutableList<String> expectedHeaders) {
return Matchers.allOf(expectedHeaders.stream()
- .map(header -> hasEntry(equalTo(header), not(isEmptyOrNullString())))
+ .map((String header) -> hasEntry(equalTo(header), not(isEmptyOrNullString())))
.collect(Collectors.toList()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: Merge remote-tracking branch
'luc/JAMES-1907_fix_eclipse_compilation'
Posted by ro...@apache.org.
Merge remote-tracking branch 'luc/JAMES-1907_fix_eclipse_compilation'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3b6c5e00
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3b6c5e00
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3b6c5e00
Branch: refs/heads/master
Commit: 3b6c5e00d53a02aadd8cae1a9b185eb159a1ba88
Parents: 97de263 6a3c010
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Tue Jan 10 11:23:49 2017 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Tue Jan 10 11:23:49 2017 +0100
----------------------------------------------------------------------
.../james/mailbox/cassandra/mail/CassandraMessageMapper.java | 2 +-
.../james/jmap/methods/integration/SetMessagesMethodTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b6c5e00/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org