[jira] [Resolved] (JAMES-2612) Move & copy batch sizes are not loaded from configuration
[ https://issues.apache.org/jira/browse/JAMES-2612?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Antoine Duprat resolved JAMES-2612. --- Resolution: Fixed Fix Version/s: 3.3.0 merged > Move & copy batch sizes are not loaded from configuration > - > > Key: JAMES-2612 > URL: https://issues.apache.org/jira/browse/JAMES-2612 > Project: James Server > Issue Type: New Feature > Components: configuration, mailbox >Reporter: Antoine Duprat >Priority: Major > Fix For: 3.3.0 > > > Changing the values of move & copy batch sizes in the _batchsizes.properties_ > configuration file has no impact. > They are both always equals to the default value (200). -- This message was sent by Atlassian JIRA (v7.6.3#76005) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[jira] [Closed] (JAMES-2612) Move & copy batch sizes are not loaded from configuration
[ https://issues.apache.org/jira/browse/JAMES-2612?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Antoine Duprat closed JAMES-2612. - > Move & copy batch sizes are not loaded from configuration > - > > Key: JAMES-2612 > URL: https://issues.apache.org/jira/browse/JAMES-2612 > Project: James Server > Issue Type: New Feature > Components: configuration, mailbox >Reporter: Antoine Duprat >Priority: Major > Fix For: 3.3.0 > > > Changing the values of move & copy batch sizes in the _batchsizes.properties_ > configuration file has no impact. > They are both always equals to the default value (200). -- This message was sent by Atlassian JIRA (v7.6.3#76005) - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
[06/10] james-project git commit: JAMES-2612 Bind core configuration
JAMES-2612 Bind core configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2cf3e69e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2cf3e69e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2cf3e69e
Branch: refs/heads/master
Commit: 2cf3e69ee1d3c605aecb58b7dcec717d865fd8d4
Parents: be30396
Author: Antoine Duprat
Authored: Wed Nov 28 14:02:27 2018 +0100
Committer: Raphael Ouazana
Committed: Mon Dec 3 11:16:29 2018 +0100
--
.../main/java/org/apache/james/modules/CommonServicesModule.java| 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/2cf3e69e/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java
--
diff --git
a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java
b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java
index c2ec854..f079fa7 100644
---
a/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java
+++
b/server/container/guice/guice-common/src/main/java/org/apache/james/modules/CommonServicesModule.java
@@ -63,6 +63,7 @@ public class CommonServicesModule extends AbstractModule {
install(new CleanupTaskModule());
bind(FileSystem.class).toInstance(fileSystem);
+bind(Configuration.class).toInstance(configuration);
bind(ConfigurationProvider.class).toInstance(new
FileConfigurationProvider(fileSystem, configuration));
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[07/10] james-project git commit: JAMES-2612 Return batch sizes in StoreMailboxManager
JAMES-2612 Return batch sizes in StoreMailboxManager
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f01817f9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f01817f9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f01817f9
Branch: refs/heads/master
Commit: f01817f90147acdafd26a62427d7719a0e85d862
Parents: 793e595
Author: Antoine Duprat
Authored: Wed Nov 28 13:59:17 2018 +0100
Committer: Raphael Ouazana
Committed: Mon Dec 3 11:16:29 2018 +0100
--
.../org/apache/james/mailbox/store/StoreMailboxManager.java | 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/f01817f9/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
--
diff --git
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
index 40885a6..7eb53d8 100644
---
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
+++
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
@@ -191,10 +191,18 @@ public class StoreMailboxManager implements
MailboxManager {
this.copyBatcher = new MessageBatcher(batchSizes.getCopyBatchSize());
}
+public int getCopyBatchSize() {
+return copyBatcher.getBatchSize();
+}
+
public void setMoveBatchSize(BatchSizes batchSizes) {
this.moveBatcher = new MessageBatcher(batchSizes.getMoveBatchSize());
}
+public int getMoveBatchSize() {
+return moveBatcher.getBatchSize();
+}
+
public void setBatchSizes(BatchSizes batchSizes) {
this.batchSizes = batchSizes;
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[04/10] james-project git commit: JAMES-2612 Fix attribute name
JAMES-2612 Fix attribute name
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f713d567
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f713d567
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f713d567
Branch: refs/heads/master
Commit: f713d567f48e01dc5c799e781c30d31ae933eb55
Parents: ce8cf47
Author: Antoine Duprat
Authored: Wed Nov 28 11:53:10 2018 +0100
Committer: Raphael Ouazana
Committed: Mon Dec 3 11:16:29 2018 +0100
--
.../org/apache/james/mailbox/store/MessageBatcher.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/f713d567/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
--
diff --git
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
index a1119e0..1848ca2 100644
---
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
+++
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
@@ -35,17 +35,17 @@ public class MessageBatcher {
List execute(MessageRange messageRange) throws
MailboxException;
}
-private final int moveBatchSize;
+private final int batchSize;
-public MessageBatcher(int moveBatchSize) {
-Preconditions.checkArgument(moveBatchSize >= NO_BATCH_SIZE);
-this.moveBatchSize = moveBatchSize;
+public MessageBatcher(int batchSize) {
+Preconditions.checkArgument(batchSize >= NO_BATCH_SIZE);
+this.batchSize = batchSize;
}
public List batchMessages(MessageRange set, BatchedOperation
batchedOperation) throws MailboxException {
-if (moveBatchSize > 0) {
+if (batchSize > 0) {
List movedRanges = new ArrayList<>();
-for (MessageRange messageRange : set.split(moveBatchSize)) {
+for (MessageRange messageRange : set.split(batchSize)) {
movedRanges.addAll(batchedOperation.execute(messageRange));
}
return movedRanges;
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[05/10] james-project git commit: JAMES-2612 MessageBatcher should give its size
JAMES-2612 MessageBatcher should give its size
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/793e5951
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/793e5951
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/793e5951
Branch: refs/heads/master
Commit: 793e5951c33227bb38cbc551dd71d9e4bba6a3fa
Parents: f713d56
Author: Antoine Duprat
Authored: Wed Nov 28 13:58:30 2018 +0100
Committer: Raphael Ouazana
Committed: Mon Dec 3 11:16:29 2018 +0100
--
.../java/org/apache/james/mailbox/store/MessageBatcher.java| 4
.../org/apache/james/mailbox/store/MessageBatcherTest.java | 6 ++
2 files changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/793e5951/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
--
diff --git
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
index 1848ca2..9f1fdc8 100644
---
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
+++
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
@@ -42,6 +42,10 @@ public class MessageBatcher {
this.batchSize = batchSize;
}
+public int getBatchSize() {
+return batchSize;
+}
+
public List batchMessages(MessageRange set, BatchedOperation
batchedOperation) throws MailboxException {
if (batchSize > 0) {
List movedRanges = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/james-project/blob/793e5951/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBatcherTest.java
--
diff --git
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBatcherTest.java
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBatcherTest.java
index 97dade9..1da24d5 100644
---
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBatcherTest.java
+++
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/MessageBatcherTest.java
@@ -66,4 +66,10 @@ public class MessageBatcherTest {
new MessageBatcher(-1);
}
+@Test
+public void getBatchSizeShouldReturnTheBatchSize() {
+int batchSize = 123;
+MessageBatcher messageBatcher = new MessageBatcher(batchSize);
+assertThat(messageBatcher.getBatchSize()).isEqualTo(batchSize);
+}
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[03/10] james-project git commit: JAMES-2612 Make PropertiesProvider less linked to file implementation We can use a classpath version in tests
JAMES-2612 Make PropertiesProvider less linked to file implementation
We can use a classpath version in 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/be303969
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/be303969
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/be303969
Branch: refs/heads/master
Commit: be303969df8c8ab7b32493c72760c25cee42484e
Parents: f01817f
Author: Antoine Duprat
Authored: Wed Nov 28 14:01:48 2018 +0100
Committer: Raphael Ouazana
Committed: Mon Dec 3 11:16:29 2018 +0100
--
.../james/modules/objectstorage/FakePropertiesProvider.java | 8 +++-
.../main/java/org/apache/james/utils/PropertiesProvider.java | 6 --
.../org/apache/james/utils/FailingPropertiesProvider.java| 7 +--
3 files changed, 16 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/be303969/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/FakePropertiesProvider.java
--
diff --git
a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/FakePropertiesProvider.java
b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/FakePropertiesProvider.java
index b4ca08b..d3ac520 100644
---
a/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/FakePropertiesProvider.java
+++
b/server/container/guice/blob-objectstorage-guice/src/test/java/org/apache/james/modules/objectstorage/FakePropertiesProvider.java
@@ -24,15 +24,21 @@ import java.io.FileNotFoundException;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.lang3.StringUtils;
+import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.utils.PropertiesProvider;
import com.google.common.collect.ImmutableMap;
public class FakePropertiesProvider extends PropertiesProvider {
+
+public static final FileSystem NULL_FILE_SYSTEM = null;
+
private ImmutableMap configurations;
public FakePropertiesProvider(ImmutableMap
configurations) {
-super(null);
+super(NULL_FILE_SYSTEM,
org.apache.james.server.core.configuration.Configuration.builder()
+.workingDirectory("fakePath")
+.build());
this.configurations = configurations;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/be303969/server/container/guice/configuration/src/main/java/org/apache/james/utils/PropertiesProvider.java
--
diff --git
a/server/container/guice/configuration/src/main/java/org/apache/james/utils/PropertiesProvider.java
b/server/container/guice/configuration/src/main/java/org/apache/james/utils/PropertiesProvider.java
index 599f335..dcf88da 100644
---
a/server/container/guice/configuration/src/main/java/org/apache/james/utils/PropertiesProvider.java
+++
b/server/container/guice/configuration/src/main/java/org/apache/james/utils/PropertiesProvider.java
@@ -35,15 +35,17 @@ import com.google.common.base.Strings;
public class PropertiesProvider {
private final FileSystem fileSystem;
+private final String configurationPrefix;
@Inject
-public PropertiesProvider(FileSystem fileSystem) {
+public PropertiesProvider(FileSystem fileSystem,
org.apache.james.server.core.configuration.Configuration configuration) {
this.fileSystem = fileSystem;
+this.configurationPrefix = configuration.configurationPath();
}
public Configuration getConfiguration(String fileName) throws
FileNotFoundException, ConfigurationException {
Preconditions.checkArgument(!Strings.isNullOrEmpty(fileName));
-File file = fileSystem.getFile(FileSystem.FILE_PROTOCOL_AND_CONF +
fileName + ".properties");
+File file = fileSystem.getFile(configurationPrefix + fileName +
".properties");
if (!file.exists()) {
throw new FileNotFoundException();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/be303969/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FailingPropertiesProvider.java
--
diff --git
a/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FailingPropertiesProvider.java
b/server/container/guice/guice-common/src/test/java/org/apache/james/utils/FailingPropertiesProvider.java
index c134952..baeea67 100644
---
a/server/container/guice/guice-common/src/test/java/org/apache/james
[09/10] james-project git commit: JAMES-2612 Move & copy batch sizes should be read from the configuration file
JAMES-2612 Move & copy batch sizes should be read from the configuration file
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/48ef09c4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/48ef09c4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/48ef09c4
Branch: refs/heads/master
Commit: 48ef09c4092c93fb59a7a0e05e6081705f1a17ad
Parents: dbe9c62
Author: Antoine Duprat
Authored: Wed Nov 28 12:23:00 2018 +0100
Committer: Raphael Ouazana
Committed: Mon Dec 3 11:16:29 2018 +0100
--
.../apache/james/modules/mailbox/CassandraMailboxModule.java | 2 ++
.../test/java/org/apache/james/CassandraJamesServerTest.java | 6 ++
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/48ef09c4/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
--
diff --git
a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
index 7668ce8..ca41b79 100644
---
a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
+++
b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
@@ -200,6 +200,8 @@ public class CassandraMailboxModule extends AbstractModule {
cassandraMailboxManager.setQuotaManager(quotaManager);
cassandraMailboxManager.setQuotaRootResolver(quotaRootResolver);
cassandraMailboxManager.setBatchSizes(batchSizes);
+cassandraMailboxManager.setMoveBatchSize(batchSizes);
+cassandraMailboxManager.setCopyBatchSize(batchSizes);
cassandraMailboxManager.init();
return cassandraMailboxManager;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/48ef09c4/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
--
diff --git
a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
index 7e1dbac..c368cd7 100644
---
a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
+++
b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
@@ -46,14 +46,12 @@ class CassandraJamesServerTest implements
JamesServerContract {
@Test
void moveBatchSizeShouldEqualsConfigurationValue(GuiceJamesServer
jamesServer) {
int moveBatchSize =
jamesServer.getProbe(ConfigurationProbe.class).getMoveBatchSize();
-// is 100 in batchsizes.properties configuration file
-assertThat(moveBatchSize).isEqualTo(200);
+assertThat(moveBatchSize).isEqualTo(100);
}
@Test
void copyBatchSizeShouldEqualsConfigurationValue(GuiceJamesServer
jamesServer) {
int copyBatchSize =
jamesServer.getProbe(ConfigurationProbe.class).getCopyBatchSize();
-// is 100 in batchsizes.properties configuration file
-assertThat(copyBatchSize).isEqualTo(200);
+assertThat(copyBatchSize).isEqualTo(100);
}
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[01/10] james-project git commit: JAMES-2612 Refactor MessageBatcher
Repository: james-project
Updated Branches:
refs/heads/master ce8cf479a -> 0e3ffde31
JAMES-2612 Refactor MessageBatcher
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0e3ffde3
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0e3ffde3
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0e3ffde3
Branch: refs/heads/master
Commit: 0e3ffde315a977a4769d0c69a76743918da502f1
Parents: 48ef09c
Author: Antoine Duprat
Authored: Thu Nov 29 09:58:15 2018 +0100
Committer: Raphael Ouazana
Committed: Mon Dec 3 11:16:29 2018 +0100
--
.../org/apache/james/mailbox/store/MessageBatcher.java | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/0e3ffde3/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
--
diff --git
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
index 9f1fdc8..6c6509c 100644
---
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
+++
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageBatcher.java
@@ -19,12 +19,13 @@
package org.apache.james.mailbox.store;
-import java.util.ArrayList;
import java.util.List;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.mailbox.model.MessageRange;
+import com.github.fge.lambdas.Throwing;
+import com.github.steveash.guavate.Guavate;
import com.google.common.base.Preconditions;
public class MessageBatcher {
@@ -48,11 +49,11 @@ public class MessageBatcher {
public List batchMessages(MessageRange set, BatchedOperation
batchedOperation) throws MailboxException {
if (batchSize > 0) {
-List movedRanges = new ArrayList<>();
-for (MessageRange messageRange : set.split(batchSize)) {
-movedRanges.addAll(batchedOperation.execute(messageRange));
-}
-return movedRanges;
+return set.split(batchSize)
+.stream()
+.flatMap(Throwing.function(range ->
batchedOperation.execute(range)
+.stream()))
+.collect(Guavate.toImmutableList());
} else {
return batchedOperation.execute(set);
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[08/10] james-project git commit: JAMES-2612 Introduce a guice probe for mailbox configuration
JAMES-2612 Introduce a guice probe for mailbox configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8ac78fbd
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8ac78fbd
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8ac78fbd
Branch: refs/heads/master
Commit: 8ac78fbd6a1bdd070e20cad7a1883c9b5d21cdd0
Parents: 2cf3e69
Author: Antoine Duprat
Authored: Wed Nov 28 12:15:08 2018 +0100
Committer: Raphael Ouazana
Committed: Mon Dec 3 11:16:29 2018 +0100
--
.../james/modules/ConfigurationProbe.java | 43
1 file changed, 43 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/8ac78fbd/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ConfigurationProbe.java
--
diff --git
a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ConfigurationProbe.java
b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ConfigurationProbe.java
new file mode 100644
index 000..de934c3
--- /dev/null
+++
b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/ConfigurationProbe.java
@@ -0,0 +1,43 @@
+/*
+ * 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.modules;
+
+import javax.inject.Inject;
+
+import org.apache.james.mailbox.store.StoreMailboxManager;
+import org.apache.james.utils.GuiceProbe;
+
+public class ConfigurationProbe implements GuiceProbe {
+
+private final StoreMailboxManager storeMailboxManager;
+
+@Inject
+private ConfigurationProbe(StoreMailboxManager storeMailboxManager) {
+this.storeMailboxManager = storeMailboxManager;
+}
+
+public int getMoveBatchSize() {
+return storeMailboxManager.getMoveBatchSize();
+}
+
+public int getCopyBatchSize() {
+return storeMailboxManager.getCopyBatchSize();
+}
+}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[02/10] james-project git commit: JAMES-2612 Prove that move & copy configuration batch sizes are not loaded
JAMES-2612 Prove that move & copy configuration batch sizes are not loaded
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/dbe9c62e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/dbe9c62e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/dbe9c62e
Branch: refs/heads/master
Commit: dbe9c62e2848b71eeb3ea6abba1308d7d8d91913
Parents: 917a34e
Author: Antoine Duprat
Authored: Wed Nov 28 12:16:27 2018 +0100
Committer: Raphael Ouazana
Committed: Mon Dec 3 11:16:29 2018 +0100
--
.../org/apache/james/CassandraJamesServerTest.java | 17 +
1 file changed, 17 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/dbe9c62e/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
--
diff --git
a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
index 8db9fe1..7e1dbac 100644
---
a/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
+++
b/server/container/guice/cassandra-guice/src/test/java/org/apache/james/CassandraJamesServerTest.java
@@ -20,10 +20,13 @@
package org.apache.james;
import static
org.apache.james.CassandraJamesServerMain.ALL_BUT_JMX_CASSANDRA_MODULE;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.james.mailbox.extractor.TextExtractor;
import org.apache.james.mailbox.store.search.PDFTextExtractor;
+import org.apache.james.modules.ConfigurationProbe;
import org.apache.james.modules.TestJMAPServerModule;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraJamesServerTest implements JamesServerContract {
@@ -39,4 +42,18 @@ class CassandraJamesServerTest implements
JamesServerContract {
.overrideWith(new TestJMAPServerModule(LIMIT_TO_10_MESSAGES))
.overrideWith(DOMAIN_LIST_CONFIGURATION_MODULE))
.build();
+
+@Test
+void moveBatchSizeShouldEqualsConfigurationValue(GuiceJamesServer
jamesServer) {
+int moveBatchSize =
jamesServer.getProbe(ConfigurationProbe.class).getMoveBatchSize();
+// is 100 in batchsizes.properties configuration file
+assertThat(moveBatchSize).isEqualTo(200);
+}
+
+@Test
+void copyBatchSizeShouldEqualsConfigurationValue(GuiceJamesServer
jamesServer) {
+int copyBatchSize =
jamesServer.getProbe(ConfigurationProbe.class).getCopyBatchSize();
+// is 100 in batchsizes.properties configuration file
+assertThat(copyBatchSize).isEqualTo(200);
+}
}
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
[10/10] james-project git commit: JAMES-2612 Load ConfigurationProbe in cassandra guice implementation
JAMES-2612 Load ConfigurationProbe in cassandra guice 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/917a34ed
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/917a34ed
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/917a34ed
Branch: refs/heads/master
Commit: 917a34ed988fa6bc6ebf41e5dfd39cb18eb84e4b
Parents: 8ac78fb
Author: Antoine Duprat
Authored: Wed Nov 28 12:15:34 2018 +0100
Committer: Raphael Ouazana
Committed: Mon Dec 3 11:16:29 2018 +0100
--
.../java/org/apache/james/modules/mailbox/JPAMailboxModule.java| 2 ++
.../src/main/java/org/apache/james/modules/MailboxModule.java | 1 +
2 files changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/james-project/blob/917a34ed/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
--
diff --git
a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
index cd3c0c4..9e87597 100644
---
a/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
+++
b/server/container/guice/jpa-guice/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
@@ -45,6 +45,7 @@ import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.mailbox.store.Authorizator;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
+import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.mail.MailboxMapperFactory;
import org.apache.james.mailbox.store.mail.MessageMapperFactory;
import org.apache.james.mailbox.store.mail.ModSeqProvider;
@@ -96,6 +97,7 @@ public class JPAMailboxModule extends AbstractModule {
bind(MailboxPathLocker.class).to(JVMMailboxPathLocker.class);
bind(Authenticator.class).to(UserRepositoryAuthenticator.class);
bind(MailboxManager.class).to(OpenJPAMailboxManager.class);
+bind(StoreMailboxManager.class).to(OpenJPAMailboxManager.class);
bind(Authorizator.class).to(UserRepositoryAuthorizator.class);
bind(MailboxId.Factory.class).to(JPAId.Factory.class);
bind(GroupMembershipResolver.class).to(SimpleGroupMembershipResolver.class);
http://git-wip-us.apache.org/repos/asf/james-project/blob/917a34ed/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxModule.java
--
diff --git
a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxModule.java
b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxModule.java
index dc8bdc7..674fa56 100644
---
a/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxModule.java
+++
b/server/container/guice/mailbox/src/main/java/org/apache/james/modules/MailboxModule.java
@@ -36,6 +36,7 @@ public class MailboxModule extends AbstractModule {
probeMultiBinder.addBinding().to(MailboxProbeImpl.class);
probeMultiBinder.addBinding().to(QuotaProbesImpl.class);
probeMultiBinder.addBinding().to(ACLProbeImpl.class);
+probeMultiBinder.addBinding().to(ConfigurationProbe.class);
bind(UnionMailboxACLResolver.class).in(Scopes.SINGLETON);
bind(MailboxACLResolver.class).to(UnionMailboxACLResolver.class);
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
