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 2017/02/14 00:28:45 UTC
[1/4] james-project git commit: JAMES-1888 No MessageIdMapper
implemented for memory
Repository: james-project
Updated Branches:
refs/heads/master 47d29f1a8 -> 3c8cec1de
JAMES-1888 No MessageIdMapper implemented for memory
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3c8e421b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3c8e421b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3c8e421b
Branch: refs/heads/master
Commit: 3c8e421b6ba32cbe792c257a080b4e7f7fbe0a68
Parents: 47d29f1
Author: Benoit Tellier <bt...@linagora.com>
Authored: Mon Feb 13 18:48:39 2017 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Mon Feb 13 18:48:39 2017 +0700
----------------------------------------------------------------------
mailbox/memory/pom.xml | 5 +++++
.../james/mailbox/inmemory/mail/InMemoryMapperProvider.java | 8 ++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3c8e421b/mailbox/memory/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml
index 98279e0..71ba2cb 100644
--- a/mailbox/memory/pom.xml
+++ b/mailbox/memory/pom.xml
@@ -66,6 +66,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3c8e421b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java
----------------------------------------------------------------------
diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java
index bc33491..1f2f65a 100644
--- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java
+++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMapperProvider.java
@@ -94,7 +94,12 @@ public class InMemoryMapperProvider implements MapperProvider {
@Override
public List<Capabilities> getSupportedCapabilities() {
- return ImmutableList.copyOf(Capabilities.values());
+ return ImmutableList.of(
+ Capabilities.MESSAGE,
+ Capabilities.MAILBOX,
+ Capabilities.ATTACHMENT,
+ Capabilities.ANNOTATION,
+ Capabilities.MOVE);
}
@Override
@@ -103,7 +108,6 @@ public class InMemoryMapperProvider implements MapperProvider {
.nextModSeq(new MockMailboxSession("user"), mailbox);
}
-
@Override
public long highestModSeq(Mailbox mailbox) throws MailboxException {
return inMemoryMailboxSessionMapperFactory.getModSeqProvider()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/4] james-project git commit: JAMES-1888 We need PathLocker for
flags update to be safe at the mapper layer for memory implementation
Posted by bt...@apache.org.
JAMES-1888 We need PathLocker for flags update to be safe at the mapper layer for memory implementation
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fa590f69
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fa590f69
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fa590f69
Branch: refs/heads/master
Commit: fa590f6978b21b25773187f924eda652783e908e
Parents: 3c8e421
Author: Benoit Tellier <bt...@linagora.com>
Authored: Mon Feb 13 18:51:21 2017 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Mon Feb 13 18:51:21 2017 +0700
----------------------------------------------------------------------
.../org/apache/james/mailbox/store/mail/model/MapperProvider.java | 3 ++-
.../apache/james/mailbox/store/mail/model/MessageMapperTest.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa590f69/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 b6b8f74..e8fb38d 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
@@ -38,7 +38,8 @@ public interface MapperProvider {
ATTACHMENT,
ANNOTATION,
MOVE,
- UNIQUE_MESSAGE_ID
+ UNIQUE_MESSAGE_ID,
+ THREAD_SAFE_FLAGS_UPDATE
}
List<Capabilities> getSupportedCapabilities();
http://git-wip-us.apache.org/repos/asf/james-project/blob/fa590f69/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 f7a315d..61d1d5d 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
@@ -784,6 +784,7 @@ public class MessageMapperTest<T extends MapperProvider> {
@ContractTest
public void setFlagsShouldWorkWithConcurrencyWithRemove() throws Exception {
+ Assume.assumeTrue(mapperProvider.getSupportedCapabilities().contains(MapperProvider.Capabilities.THREAD_SAFE_FLAGS_UPDATE));
saveMessages();
final int threadCount = 4;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/4] james-project git commit: JAMES-1888 missing jar for runtime
while playing contract tests
Posted by bt...@apache.org.
JAMES-1888 missing jar for runtime while playing contract tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3c8cec1d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3c8cec1d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3c8cec1d
Branch: refs/heads/master
Commit: 3c8cec1dec609f8ceab9c62c24bd9322da590e5a
Parents: b6feaa0
Author: Benoit Tellier <bt...@linagora.com>
Authored: Mon Feb 13 18:52:27 2017 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Feb 14 07:28:04 2017 +0700
----------------------------------------------------------------------
mailbox/cassandra/pom.xml | 5 +++++
mailbox/jpa/pom.xml | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3c8cec1d/mailbox/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml
index 2622c77..862fb98 100644
--- a/mailbox/cassandra/pom.xml
+++ b/mailbox/cassandra/pom.xml
@@ -218,6 +218,11 @@
<type>test-jar</type>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>james-server-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3c8cec1d/mailbox/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml
index 906d820..6630dc5 100644
--- a/mailbox/jpa/pom.xml
+++ b/mailbox/jpa/pom.xml
@@ -76,6 +76,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-1.version}</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/4] james-project git commit: JAMES-1888 Correct a test for
MessageIdMapperTest
Posted by bt...@apache.org.
JAMES-1888 Correct a test for MessageIdMapperTest
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b6feaa01
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b6feaa01
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b6feaa01
Branch: refs/heads/master
Commit: b6feaa017534f9bbb3201f42c098e742a58dfa6e
Parents: fa590f6
Author: Benoit Tellier <bt...@linagora.com>
Authored: Mon Feb 13 18:51:53 2017 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Mon Feb 13 18:51:53 2017 +0700
----------------------------------------------------------------------
.../james/mailbox/store/mail/model/MessageIdMapperTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b6feaa01/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
index b5c1070..fed386c 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageIdMapperTest.java
@@ -488,13 +488,13 @@ public class MessageIdMapperTest<T extends MapperProvider> {
.newFlags(newFlags)
.build();
UpdatedFlags expectedUpdatedFlags2 = UpdatedFlags.builder()
- .uid(message1.getUid())
+ .uid(message1InOtherMailbox.getUid())
.modSeq(modSeqBenwaWorkMailbox)
.oldFlags(new Flags())
.newFlags(newFlags)
.build();
assertThat(flags).containsOnly(MapEntry.entry(benwaInboxMailbox.getMailboxId(), expectedUpdatedFlags),
- MapEntry.entry(benwaWorkMailbox.getMailboxId(), expectedUpdatedFlags2));
+ MapEntry.entry(message1InOtherMailbox.getMailboxId(), expectedUpdatedFlags2));
}
@ContractTest
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org