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 2020/05/04 03:21:30 UTC
[james-project] 11/12: JAMES-3105
s/trustMessageDenormalization/trustMessageProjection/
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b72ac0831458a0d7df216361d721a95f01797738
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Apr 24 17:23:40 2020 +0700
JAMES-3105 s/trustMessageDenormalization/trustMessageProjection/
---
.../mail/task/RecomputeMailboxCountersService.java | 20 ++++++++++----------
.../mail/task/RecomputeMailboxCountersTaskDTO.java | 16 ++++++++--------
.../task/RecomputeMailboxCountersServiceTest.java | 4 ++--
...ecomputeMailboxCountersTaskSerializationTest.java | 8 ++++----
.../RecomputeMailboxCountersRequestToTask.java | 4 ++--
.../RecomputeMailboxCountersRequestToTaskTest.java | 8 ++++----
src/site/markdown/server/manage-webadmin.md | 2 +-
7 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersService.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersService.java
index 7970a32..7bb4093 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersService.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersService.java
@@ -56,11 +56,11 @@ public class RecomputeMailboxCountersService {
private static final int MESSAGE_CONCURRENCY = 8;
public static class Options {
- public static Options trustMessageDenormalization() {
+ public static Options trustMessageProjection() {
return of(true);
}
- public static Options recheckMessageDenormalization() {
+ public static Options recheckMessageProjection() {
return of(false);
}
@@ -68,14 +68,14 @@ public class RecomputeMailboxCountersService {
return new Options(value);
}
- private final boolean trustMessageDenormalization;
+ private final boolean trustMessageProjection;
- private Options(boolean trustMessageDenormalization) {
- this.trustMessageDenormalization = trustMessageDenormalization;
+ private Options(boolean trustMessageProjection) {
+ this.trustMessageProjection = trustMessageProjection;
}
- public boolean isMessageDenormalizationTrusted() {
- return trustMessageDenormalization;
+ public boolean isMessageProjectionTrusted() {
+ return trustMessageProjection;
}
@Override
@@ -83,14 +83,14 @@ public class RecomputeMailboxCountersService {
if (o instanceof Options) {
Options options = (Options) o;
- return Objects.equals(this.trustMessageDenormalization, options.trustMessageDenormalization);
+ return Objects.equals(this.trustMessageProjection, options.trustMessageProjection);
}
return false;
}
@Override
public final int hashCode() {
- return Objects.hash(trustMessageDenormalization);
+ return Objects.hash(trustMessageProjection);
}
}
@@ -235,7 +235,7 @@ public class RecomputeMailboxCountersService {
private Flux<ComposedMessageIdWithMetaData> latestMetadata(CassandraId mailboxId,
ComposedMessageIdWithMetaData message,
Options options) {
- if (options.isMessageDenormalizationTrusted()) {
+ if (options.isMessageProjectionTrusted()) {
return Flux.just(message);
}
CassandraMessageId messageId = (CassandraMessageId) message.getComposedMessageId().getMessageId();
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskDTO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskDTO.java
index d855aa1..6dde6e4 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskDTO.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskDTO.java
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class RecomputeMailboxCountersTaskDTO implements TaskDTO {
private static RecomputeMailboxCountersTaskDTO toDTO(RecomputeMailboxCountersTask domainObject, String typeName) {
- return new RecomputeMailboxCountersTaskDTO(typeName, Optional.of(domainObject.getOptions().isMessageDenormalizationTrusted()));
+ return new RecomputeMailboxCountersTaskDTO(typeName, Optional.of(domainObject.getOptions().isMessageProjectionTrusted()));
}
public static TaskDTOModule<RecomputeMailboxCountersTask, RecomputeMailboxCountersTaskDTO> module(RecomputeMailboxCountersService service) {
@@ -43,16 +43,16 @@ public class RecomputeMailboxCountersTaskDTO implements TaskDTO {
}
private final String type;
- private final Optional<Boolean> trustMessageDenormalization;
+ private final Optional<Boolean> trustMessageProjection;
public RecomputeMailboxCountersTaskDTO(@JsonProperty("type") String type,
- @JsonProperty("trustMessageDenormalization") Optional<Boolean> trustMessageDenormalization) {
+ @JsonProperty("trustMessageProjection") Optional<Boolean> trustMessageProjection) {
this.type = type;
- this.trustMessageDenormalization = trustMessageDenormalization;
+ this.trustMessageProjection = trustMessageProjection;
}
private RecomputeMailboxCountersTask toDomainObject(RecomputeMailboxCountersService service) {
- Options options = trustMessageDenormalization.map(Options::of).orElse(Options.recheckMessageDenormalization());
+ Options options = trustMessageProjection.map(Options::of).orElse(Options.recheckMessageProjection());
return new RecomputeMailboxCountersTask(service, options);
}
@@ -62,8 +62,8 @@ public class RecomputeMailboxCountersTaskDTO implements TaskDTO {
return type;
}
- @JsonProperty("trustMessageDenormalization")
- public Optional<Boolean> trustMessageDenormalization() {
- return trustMessageDenormalization;
+ @JsonProperty("trustMessageProjection")
+ public Optional<Boolean> trustMessageProjection() {
+ return trustMessageProjection;
}
}
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersServiceTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersServiceTest.java
index 4df80a4..fdf059a 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersServiceTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersServiceTest.java
@@ -113,7 +113,7 @@ class RecomputeMailboxCountersServiceTest {
@Override
public Options options() {
- return Options.trustMessageDenormalization();
+ return Options.trustMessageProjection();
}
@Override
@@ -164,7 +164,7 @@ class RecomputeMailboxCountersServiceTest {
@Override
public Options options() {
- return Options.recheckMessageDenormalization();
+ return Options.recheckMessageProjection();
}
@Override
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskSerializationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskSerializationTest.java
index e46fa08..d5bd9d8 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskSerializationTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTaskSerializationTest.java
@@ -36,15 +36,15 @@ class RecomputeMailboxCountersTaskSerializationTest {
private static final String MAILBOX_ID_AS_STRING = "464765a0-e4e7-11e4-aba4-710c1de3782b";
private static final RecomputeMailboxCountersService SERVICE = mock(RecomputeMailboxCountersService.class);
- private static final RecomputeMailboxCountersTask TASK_TRUSTED = new RecomputeMailboxCountersTask(SERVICE, Options.trustMessageDenormalization());
- private static final RecomputeMailboxCountersTask TASK_UNTRUSTED = new RecomputeMailboxCountersTask(SERVICE, Options.recheckMessageDenormalization());
+ private static final RecomputeMailboxCountersTask TASK_TRUSTED = new RecomputeMailboxCountersTask(SERVICE, Options.trustMessageProjection());
+ private static final RecomputeMailboxCountersTask TASK_UNTRUSTED = new RecomputeMailboxCountersTask(SERVICE, Options.recheckMessageProjection());
private static final String SERIALIZED_TASK_TRUSTED = "{" +
" \"type\": \"recompute-mailbox-counters\"," +
- " \"trustMessageDenormalization\": true" +
+ " \"trustMessageProjection\": true" +
"}";
private static final String SERIALIZED_TASK_UNTRUSTED = "{" +
" \"type\": \"recompute-mailbox-counters\"," +
- " \"trustMessageDenormalization\": false" +
+ " \"trustMessageProjection\": false" +
"}";
private static final String SERIALIZED_TASK_OLD = "{\"type\": \"recompute-mailbox-counters\"}";
private static final RecomputeMailboxCountersTask.Details DETAILS = new RecomputeMailboxCountersTask.Details(TIMESTAMP, 12, ImmutableList.of(MAILBOX_ID_AS_STRING));
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/RecomputeMailboxCountersRequestToTask.java b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/RecomputeMailboxCountersRequestToTask.java
index a090913..f1e230c 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/RecomputeMailboxCountersRequestToTask.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/RecomputeMailboxCountersRequestToTask.java
@@ -36,7 +36,7 @@ import spark.Request;
public class RecomputeMailboxCountersRequestToTask extends TaskFromRequestRegistry.TaskRegistration {
private static final TaskRegistrationKey REGISTRATION_KEY = TaskRegistrationKey.of("RecomputeMailboxCounters");
- public static final String TRUST_PARAM = "trustMessageDenormalization";
+ public static final String TRUST_PARAM = "trustMessageProjection";
@Inject
public RecomputeMailboxCountersRequestToTask(RecomputeMailboxCountersService service) {
@@ -53,7 +53,7 @@ public class RecomputeMailboxCountersRequestToTask extends TaskFromRequestRegist
static Options parseOptions(Optional<String> stringValue) {
return stringValue
.map(RecomputeMailboxCountersRequestToTask::parseOptions)
- .orElse(Options.recheckMessageDenormalization());
+ .orElse(Options.recheckMessageProjection());
}
private static Options parseOptions(String stringValue) {
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/RecomputeMailboxCountersRequestToTaskTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/RecomputeMailboxCountersRequestToTaskTest.java
index 780fb71..76691ee 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/RecomputeMailboxCountersRequestToTaskTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/RecomputeMailboxCountersRequestToTaskTest.java
@@ -31,25 +31,25 @@ class RecomputeMailboxCountersRequestToTaskTest {
@Test
void parseOptionsShouldReturnRecheckWhenEmpty() {
assertThat(RecomputeMailboxCountersRequestToTask.parseOptions(Optional.empty()))
- .isEqualTo(Options.recheckMessageDenormalization());
+ .isEqualTo(Options.recheckMessageProjection());
}
@Test
void parseOptionsShouldReturnRecheckWhenFalse() {
assertThat(RecomputeMailboxCountersRequestToTask.parseOptions(Optional.of("false")))
- .isEqualTo(Options.recheckMessageDenormalization());
+ .isEqualTo(Options.recheckMessageProjection());
}
@Test
void parseOptionsShouldBeCaseIncentive() {
assertThat(RecomputeMailboxCountersRequestToTask.parseOptions(Optional.of("False")))
- .isEqualTo(Options.recheckMessageDenormalization());
+ .isEqualTo(Options.recheckMessageProjection());
}
@Test
void parseOptionsShouldReturnTrueWhenTrust() {
assertThat(RecomputeMailboxCountersRequestToTask.parseOptions(Optional.of("true")))
- .isEqualTo(Options.trustMessageDenormalization());
+ .isEqualTo(Options.trustMessageProjection());
}
@Test
diff --git a/src/site/markdown/server/manage-webadmin.md b/src/site/markdown/server/manage-webadmin.md
index e3823fa..c16e700 100644
--- a/src/site/markdown/server/manage-webadmin.md
+++ b/src/site/markdown/server/manage-webadmin.md
@@ -491,7 +491,7 @@ Rerunning the task will *eventually* provide the consistent result. As such we a
In order to ensure being offline, stop the traffic on SMTP, JMAP and IMAP ports, for example via re-configuration or
firewall rules.
-`trustMessageDenormalization` query parameter can be set to `true`. This will result in a better performance running the
+`trustMessageProjection` query parameter can be set to `true`. This will result in a better performance running the
task at the cost of safety in the face of message denormalization inconsistencies. Defaults to false, which generates
additional checks.
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org