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/01/15 03:21:45 UTC
[10/30] james-project git commit: JAMES-2641 BatchSizes can be missing
JAMES-2641 BatchSizes can be missing
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/69487bdf
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/69487bdf
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/69487bdf
Branch: refs/heads/master
Commit: 69487bdf385f0fe8d00f714eeaad56a75297ca61
Parents: c4be7f6
Author: Benoit Tellier <bt...@linagora.com>
Authored: Tue Jan 8 16:59:24 2019 +0700
Committer: Benoit Tellier <bt...@linagora.com>
Committed: Tue Jan 15 10:10:04 2019 +0700
----------------------------------------------------------------------
.../org/apache/james/mailbox/store/BatchSizes.java | 14 +++++++-------
.../mailbox/store/MailboxManagerConfiguration.java | 9 +++------
.../apache/james/mailbox/store/BatchSizesTest.java | 16 ++++++++--------
3 files changed, 18 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/69487bdf/mailbox/store/src/main/java/org/apache/james/mailbox/store/BatchSizes.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/BatchSizes.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/BatchSizes.java
index 1d6efde..26d622b 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/BatchSizes.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/BatchSizes.java
@@ -107,8 +107,8 @@ public class BatchSizes {
fetchHeaders.orElse(DEFAULT_BATCH_SIZE),
fetchBody.orElse(DEFAULT_BATCH_SIZE),
fetchFull.orElse(DEFAULT_BATCH_SIZE),
- copyBatchSize.orElse(DEFAULT_BATCH_SIZE),
- moveBatchSize.orElse(DEFAULT_BATCH_SIZE));
+ copyBatchSize,
+ moveBatchSize);
}
}
@@ -116,10 +116,10 @@ public class BatchSizes {
private final int fetchHeaders;
private final int fetchBody;
private final int fetchFull;
- private final int copyBatchSize;
- private final int moveBatchSize;
+ private final Optional<Integer> copyBatchSize;
+ private final Optional<Integer> moveBatchSize;
- private BatchSizes(int fetchMetadata, int fetchHeaders, int fetchBody, int fetchFull, int copyBatchSize, int moveBatchSize) {
+ private BatchSizes(int fetchMetadata, int fetchHeaders, int fetchBody, int fetchFull, Optional<Integer> copyBatchSize, Optional<Integer> moveBatchSize) {
this.fetchMetadata = fetchMetadata;
this.fetchHeaders = fetchHeaders;
this.fetchBody = fetchBody;
@@ -144,11 +144,11 @@ public class BatchSizes {
return fetchFull;
}
- public int getCopyBatchSize() {
+ public Optional<Integer> getCopyBatchSize() {
return copyBatchSize;
}
- public int getMoveBatchSize() {
+ public Optional<Integer> getMoveBatchSize() {
return moveBatchSize;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/69487bdf/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxManagerConfiguration.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxManagerConfiguration.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxManagerConfiguration.java
index 63c47e7..2f12b06 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxManagerConfiguration.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MailboxManagerConfiguration.java
@@ -22,10 +22,7 @@ package org.apache.james.mailbox.store;
import javax.inject.Inject;
public class MailboxManagerConfiguration {
- public static final MailboxManagerConfiguration DEFAULT = new MailboxManagerConfiguration(BatchSizes.builder()
- .copyBatchSize(MessageBatcher.NO_BATCH_SIZE)
- .moveBatchSize(MessageBatcher.NO_BATCH_SIZE)
- .build());
+ public static final MailboxManagerConfiguration DEFAULT = new MailboxManagerConfiguration(BatchSizes.defaultValues());
private final BatchSizes batchSizes;
@@ -39,10 +36,10 @@ public class MailboxManagerConfiguration {
}
public MessageBatcher getCopyBatcher() {
- return new MessageBatcher(batchSizes.getCopyBatchSize());
+ return new MessageBatcher(batchSizes.getCopyBatchSize().orElse(MessageBatcher.NO_BATCH_SIZE));
}
public MessageBatcher getMoveBatcher() {
- return new MessageBatcher(batchSizes.getMoveBatchSize());
+ return new MessageBatcher(batchSizes.getMoveBatchSize().orElse(MessageBatcher.NO_BATCH_SIZE));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/69487bdf/mailbox/store/src/test/java/org/apache/james/mailbox/store/BatchSizesTest.java
----------------------------------------------------------------------
diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/BatchSizesTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/BatchSizesTest.java
index 275387f..2495da0 100644
--- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/BatchSizesTest.java
+++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/BatchSizesTest.java
@@ -43,8 +43,8 @@ public class BatchSizesTest {
assertThat(batchSizes.getFetchHeaders()).isEqualTo(BatchSizes.DEFAULT_BATCH_SIZE);
assertThat(batchSizes.getFetchBody()).isEqualTo(BatchSizes.DEFAULT_BATCH_SIZE);
assertThat(batchSizes.getFetchFull()).isEqualTo(BatchSizes.DEFAULT_BATCH_SIZE);
- assertThat(batchSizes.getCopyBatchSize()).isEqualTo(BatchSizes.DEFAULT_BATCH_SIZE);
- assertThat(batchSizes.getMoveBatchSize()).isEqualTo(BatchSizes.DEFAULT_BATCH_SIZE);
+ assertThat(batchSizes.getCopyBatchSize()).isEmpty();
+ assertThat(batchSizes.getMoveBatchSize()).isEmpty();
}
@Test
@@ -55,8 +55,8 @@ public class BatchSizesTest {
assertThat(batchSizes.getFetchHeaders()).isEqualTo(batchSize);
assertThat(batchSizes.getFetchBody()).isEqualTo(batchSize);
assertThat(batchSizes.getFetchFull()).isEqualTo(batchSize);
- assertThat(batchSizes.getCopyBatchSize()).isEqualTo(batchSize);
- assertThat(batchSizes.getMoveBatchSize()).isEqualTo(batchSize);
+ assertThat(batchSizes.getCopyBatchSize()).contains(batchSize);
+ assertThat(batchSizes.getMoveBatchSize()).contains(batchSize);
}
@Test
@@ -223,7 +223,7 @@ public class BatchSizesTest {
public void buildShouldSetDefaultValueToCopyBatchSizeWhenNotGiven() {
BatchSizes batchSizes = BatchSizes.builder()
.build();
- assertThat(batchSizes.getCopyBatchSize()).isEqualTo(BatchSizes.DEFAULT_BATCH_SIZE);
+ assertThat(batchSizes.getCopyBatchSize()).isEmpty();
}
@Test
@@ -232,14 +232,14 @@ public class BatchSizesTest {
BatchSizes batchSizes = BatchSizes.builder()
.copyBatchSize(expected)
.build();
- assertThat(batchSizes.getCopyBatchSize()).isEqualTo(expected);
+ assertThat(batchSizes.getCopyBatchSize()).contains(expected);
}
@Test
public void buildShouldSetDefaultValueToMoveBatchSizeWhenNotGiven() {
BatchSizes batchSizes = BatchSizes.builder()
.build();
- assertThat(batchSizes.getMoveBatchSize()).isEqualTo(BatchSizes.DEFAULT_BATCH_SIZE);
+ assertThat(batchSizes.getMoveBatchSize()).isEmpty();
}
@Test
@@ -248,6 +248,6 @@ public class BatchSizesTest {
BatchSizes batchSizes = BatchSizes.builder()
.moveBatchSize(expected)
.build();
- assertThat(batchSizes.getMoveBatchSize()).isEqualTo(expected);
+ assertThat(batchSizes.getMoveBatchSize()).contains(expected);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org