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 2020/06/11 15:25:42 UTC
[james-project] 05/17: JAMES-3194 Remove Jackson annotations from
AdditionalInformation
This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 4d529f74497b42c10247f8f6f651a2d658b42409
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon May 18 13:33:56 2020 +0700
JAMES-3194 Remove Jackson annotations from AdditionalInformation
---
.../cassandra/mail/task/RecomputeMailboxCountersTask.java | 3 ---
.../cassandra/mail/task/SolveMailboxInconsistenciesTask.java | 6 ------
.../cassandra/mail/task/SolveMessageInconsistenciesTask.java | 9 ---------
.../mailbox/tools/indexer/ReprocessingContextInformation.java | 3 ---
.../james/mailbox/quota/task/RecomputeCurrentQuotasTask.java | 3 ---
.../EventDeadLettersRedeliveryTaskAdditionalInformation.java | 4 ----
6 files changed, 28 deletions(-)
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTask.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTask.java
index c93e1ea..e7433de 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTask.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/RecomputeMailboxCountersTask.java
@@ -32,7 +32,6 @@ import org.apache.james.task.TaskType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.steveash.guavate.Guavate;
import com.google.common.collect.ImmutableList;
@@ -58,12 +57,10 @@ public class RecomputeMailboxCountersTask implements Task {
return instant;
}
- @JsonProperty("processedMailboxes")
long getProcessedMailboxes() {
return processedMailboxes;
}
- @JsonProperty("failedMailboxes")
ImmutableList<String> getFailedMailboxes() {
return failedMailboxes;
}
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTask.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTask.java
index 2139d25..d68b800 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTask.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMailboxInconsistenciesTask.java
@@ -30,7 +30,6 @@ import org.apache.james.task.TaskType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.steveash.guavate.Guavate;
import com.google.common.collect.ImmutableList;
@@ -62,27 +61,22 @@ public class SolveMailboxInconsistenciesTask implements Task {
return instant;
}
- @JsonProperty("processedMailboxEntries")
long getProcessedMailboxEntries() {
return processedMailboxEntries;
}
- @JsonProperty("processedMailboxPathEntries")
long getProcessedMailboxPathEntries() {
return processedMailboxPathEntries;
}
- @JsonProperty("fixedInconsistencies")
ImmutableList<String> getFixedInconsistencies() {
return fixedInconsistencies;
}
- @JsonProperty("conflictingEntries")
ImmutableList<ConflictingEntry> getConflictingEntries() {
return conflictingEntries;
}
- @JsonProperty("errors")
long getErrors() {
return errors;
}
diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTask.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTask.java
index c56b8b3..d85805d 100644
--- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTask.java
+++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/task/SolveMessageInconsistenciesTask.java
@@ -31,7 +31,6 @@ import org.apache.james.task.Task;
import org.apache.james.task.TaskExecutionDetails;
import org.apache.james.task.TaskType;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.steveash.guavate.Guavate;
import com.google.common.collect.ImmutableList;
@@ -69,42 +68,34 @@ public class SolveMessageInconsistenciesTask implements Task {
return instant;
}
- @JsonProperty("processedImapUidEntries")
public long getProcessedImapUidEntries() {
return processedImapUidEntries;
}
- @JsonProperty("processedMessageIdEntries")
public long getProcessedMessageIdEntries() {
return processedMessageIdEntries;
}
- @JsonProperty("addedMessageIdEntries")
public long getAddedMessageIdEntries() {
return addedMessageIdEntries;
}
- @JsonProperty("updatedMessageIdEntries")
public long getUpdatedMessageIdEntries() {
return updatedMessageIdEntries;
}
- @JsonProperty("removedMessageIdEntries")
public long getRemovedMessageIdEntries() {
return removedMessageIdEntries;
}
- @JsonProperty("runningOptions")
public RunningOptions getRunningOptions() {
return runningOptions;
}
- @JsonProperty("fixedInconsistencies")
public ImmutableList<MessageInconsistenciesEntry> getFixedInconsistencies() {
return fixedInconsistencies;
}
- @JsonProperty("errors")
public ImmutableList<MessageInconsistenciesEntry> getErrors() {
return errors;
}
diff --git a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformation.java b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformation.java
index 2517c07..0dc02b0 100644
--- a/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformation.java
+++ b/mailbox/tools/indexer/src/main/java/org/apache/mailbox/tools/indexer/ReprocessingContextInformation.java
@@ -26,8 +26,6 @@ import org.apache.james.mailbox.indexer.ReIndexer.RunningOptions;
import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures;
import org.apache.james.task.TaskExecutionDetails;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
public class ReprocessingContextInformation implements TaskExecutionDetails.AdditionalInformation, IndexingDetailInformation {
private final int successfullyReprocessedMailCount;
@@ -56,7 +54,6 @@ public class ReprocessingContextInformation implements TaskExecutionDetails.Addi
}
@Override
- @JsonIgnore
public ReIndexingExecutionFailures failures() {
return failures;
}
diff --git a/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTask.java b/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTask.java
index 355c6bb..cfe6824 100644
--- a/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTask.java
+++ b/mailbox/tools/quota-recompute/src/main/java/org/apache/james/mailbox/quota/task/RecomputeCurrentQuotasTask.java
@@ -31,7 +31,6 @@ import org.apache.james.task.Task;
import org.apache.james.task.TaskExecutionDetails;
import org.apache.james.task.TaskType;
-import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.steveash.guavate.Guavate;
import com.google.common.collect.ImmutableList;
@@ -58,12 +57,10 @@ public class RecomputeCurrentQuotasTask implements Task {
return instant;
}
- @JsonProperty("processedQuotaRoots")
long getProcessedQuotaRoots() {
return processedQuotaRoots;
}
- @JsonProperty("failedQuotaRoots")
ImmutableList<String> getFailedQuotaRoots() {
return failedQuotaRoots;
}
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliveryTaskAdditionalInformation.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliveryTaskAdditionalInformation.java
index 95efa3f..cddf8d6 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliveryTaskAdditionalInformation.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/EventDeadLettersRedeliveryTaskAdditionalInformation.java
@@ -25,8 +25,6 @@ import org.apache.james.mailbox.events.EventDeadLetters;
import org.apache.james.mailbox.events.Group;
import org.apache.james.task.TaskExecutionDetails;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
public class EventDeadLettersRedeliveryTaskAdditionalInformation implements TaskExecutionDetails.AdditionalInformation {
private final long successfulRedeliveriesCount;
private final long failedRedeliveriesCount;
@@ -54,12 +52,10 @@ public class EventDeadLettersRedeliveryTaskAdditionalInformation implements Task
return failedRedeliveriesCount;
}
- @JsonInclude(JsonInclude.Include.NON_ABSENT)
public Optional<String> getGroup() {
return group.map(Group::asString);
}
- @JsonInclude(JsonInclude.Include.NON_ABSENT)
public Optional<String> getInsertionId() {
return insertionId.map(insertionId -> insertionId.getId().toString());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org