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
The following commit(s) were added to refs/heads/master by this push:
new a72e809 JAMES-2813 Globally fix typo: information has no plural
a72e809 is described below
commit a72e80942c5dbc654da1e700b7860f94b328ec2c
Author: Raphael Ouazana <[email protected]>
AuthorDate: Tue Oct 15 11:08:31 2019 +0200
JAMES-2813 Globally fix typo: information has no plural
---
.../cassandra/migration/MigrationTask.java | 6 ++--
... => MigrationTaskAdditionalInformationDTO.java} | 14 ++++----
.../migration/MigrationTaskSerializationTest.java | 10 +++---
grafana-reporting/README.md | 2 +-
.../apache/james/mailbox/model/MessageResult.java | 2 +-
...ailboxPathV2MigrationTaskSerializationTest.java | 8 ++---
.../mail/task/MailboxMergingTaskTest.java | 8 ++---
...aultGarbageCollectionTaskSerializationTest.java | 8 ++---
...rorRecoveryIndexationTaskSerializationTest.java | 6 ++--
.../FullReindexingTaskSerializationTest.java | 6 ++--
.../MessageIdReindexingTaskSerializationTest.java | 6 ++--
...ngleMailboxReindexingTaskSerializationTest.java | 6 ++--
...ngleMessageReindexingTaskSerializationTest.java | 4 +--
.../UserReindexingTaskSerializationTest.java | 6 ++--
.../james/imap/decode/ImapRequestLineReader.java | 2 +-
.../james/imap/processor/StoreProcessor.java | 2 +-
server/app/src/main/resources/smtpserver.xml | 2 +-
.../james/modules/TaskSerializationModule.java | 30 ++++++++--------
...pingsSourcesMigrationTaskSerializationTest.java | 8 ++---
.../mailrepository/jdbc/MessageInputStream.java | 4 +--
.../james/smtpserver/fastfail/URIRBLHandler.java | 2 +-
...edMessagesVaultDeleteTaskSerializationTest.java | 6 ++--
...edMessagesVaultExportTaskSerializationTest.java | 10 +++---
...dMessagesVaultRestoreTaskSerializationTest.java | 8 ++---
.../service/EventDeadLettersRedeliverTaskTest.java | 4 +--
.../webadmin/service/ClearMailQueueTaskTest.java | 4 +--
.../service/DeleteMailsFromMailQueueTaskTest.java | 16 ++++-----
.../service/ClearMailRepositoryTaskTest.java | 4 +--
.../service/ReprocessingAllMailsTaskTest.java | 10 +++---
.../service/ReprocessingOneMailTaskTest.java | 4 +--
.../james/task/MemoryReferenceWithCounterTask.java | 2 +-
.../distributed/TasksSerializationModule.java | 38 ++++++++++----------
...assandraTaskExecutionDetailsProjectionDAO.scala | 16 ++++-----
.../eventsourcing/distributed/TaskEventDTO.scala | 42 +++++++++++-----------
...andraTaskExecutionDetailsProjectionDAOTest.java | 8 ++---
...assandraTaskExecutionDetailsProjectionTest.java | 8 ++---
.../distributed/DistributedTaskManagerTest.java | 8 ++---
.../RabbitMQTerminationSubscriberTest.java | 6 ++--
.../distributed/TaskEventsSerializationTest.java | 4 +--
...> JsonTaskAdditionalInformationSerializer.java} | 12 +++----
src/homepage/_posts/2006-08-03-2.3.0-RC3.markdown | 2 +-
src/homepage/_posts/2006-10-03-JAMES-2.3.markdown | 2 +-
.../install/guice-cassandra-rabbitmq-swift.md | 2 +-
src/site/markdown/server/manage-webadmin.md | 2 +-
src/site/xdoc/documentation.xml | 2 +-
.../xdoc/server/archive/configuration_v2_0.xml | 2 +-
src/site/xdoc/server/dev-extend-smtp-hook.xml | 2 +-
47 files changed, 182 insertions(+), 184 deletions(-)
diff --git
a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java
b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java
index 8c6dcf6..6aebb3a 100644
---
a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java
+++
b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java
@@ -67,12 +67,12 @@ public class MigrationTask implements Task {
public static final TaskType CASSANDRA_MIGRATION =
TaskType.of("CassandraMigration");
- public static class AdditionalInformations implements
TaskExecutionDetails.AdditionalInformation {
+ public static class AdditionalInformation implements
TaskExecutionDetails.AdditionalInformation {
private final SchemaVersion toVersion;
private final Instant timestamp;
- public AdditionalInformations(SchemaVersion toVersion, Instant
timestamp) {
+ public AdditionalInformation(SchemaVersion toVersion, Instant
timestamp) {
this.toVersion = toVersion;
this.timestamp = timestamp;
}
@@ -157,7 +157,7 @@ public class MigrationTask implements Task {
@Override
public Optional<TaskExecutionDetails.AdditionalInformation> details() {
- return Optional.of(new AdditionalInformations(target,
Clock.systemUTC().instant()));
+ return Optional.of(new AdditionalInformation(target,
Clock.systemUTC().instant()));
}
}
diff --git
a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationsDTO.java
b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationDTO.java
similarity index 83%
rename from
backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationsDTO.java
rename to
backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationDTO.java
index 1b68a38..0206b6e 100644
---
a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationsDTO.java
+++
b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTaskAdditionalInformationDTO.java
@@ -27,13 +27,13 @@ import
org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
import com.fasterxml.jackson.annotation.JsonProperty;
-public class MigrationTaskAdditionalInformationsDTO implements
AdditionalInformationDTO {
+public class MigrationTaskAdditionalInformationDTO implements
AdditionalInformationDTO {
- public static final
AdditionalInformationDTOModule<MigrationTask.AdditionalInformations,
MigrationTaskAdditionalInformationsDTO> serializationModule() {
- return
DTOModule.forDomainObject(MigrationTask.AdditionalInformations.class)
- .convertToDTO(MigrationTaskAdditionalInformationsDTO.class)
- .toDomainObjectConverter(dto -> new
MigrationTask.AdditionalInformations(new SchemaVersion(dto.getTargetVersion()),
dto.timestamp))
- .toDTOConverter((details, type) -> new
MigrationTaskAdditionalInformationsDTO(type, details.getToVersion(),
details.timestamp()))
+ public static final
AdditionalInformationDTOModule<MigrationTask.AdditionalInformation,
MigrationTaskAdditionalInformationDTO> serializationModule() {
+ return
DTOModule.forDomainObject(MigrationTask.AdditionalInformation.class)
+ .convertToDTO(MigrationTaskAdditionalInformationDTO.class)
+ .toDomainObjectConverter(dto -> new
MigrationTask.AdditionalInformation(new SchemaVersion(dto.getTargetVersion()),
dto.timestamp))
+ .toDTOConverter((details, type) -> new
MigrationTaskAdditionalInformationDTO(type, details.getToVersion(),
details.timestamp()))
.typeName(MigrationTask.CASSANDRA_MIGRATION.asString())
.withFactory(AdditionalInformationDTOModule::new);
}
@@ -42,7 +42,7 @@ public class MigrationTaskAdditionalInformationsDTO
implements AdditionalInforma
private final int targetVersion;
private final Instant timestamp;
- public MigrationTaskAdditionalInformationsDTO(@JsonProperty("type") String
type,
+ public MigrationTaskAdditionalInformationDTO(@JsonProperty("type") String
type,
@JsonProperty("targetVersion") int targetVersion,
@JsonProperty("timestamp")
Instant timestamp) {
this.type = type;
diff --git
a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/MigrationTaskSerializationTest.java
b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/MigrationTaskSerializationTest.java
index 8ce6df7..bf729b4 100644
---
a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/MigrationTaskSerializationTest.java
+++
b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/MigrationTaskSerializationTest.java
@@ -27,7 +27,7 @@ import java.time.Instant;
import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO;
import org.apache.james.backends.cassandra.versions.SchemaVersion;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.junit.jupiter.api.Test;
@@ -44,7 +44,7 @@ class MigrationTaskSerializationTest {
private final CassandraSchemaTransitions transitions =
mock(CassandraSchemaTransitions.class);
private final MigrationTask.Factory factory = target -> new
MigrationTask(cassandraSchemaVersionDAO, transitions, target);
private final JsonTaskSerializer taskSerializer = new
JsonTaskSerializer(MigrationTaskDTO.module(factory));
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(MigrationTaskAdditionalInformationsDTO.serializationModule());
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(MigrationTaskAdditionalInformationDTO.serializationModule());
@Test
void taskShouldBeSerializable() throws JsonProcessingException {
@@ -61,13 +61,13 @@ class MigrationTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws
JsonProcessingException {
- MigrationTask.AdditionalInformations details = new
MigrationTask.AdditionalInformations(new SchemaVersion(SCHEMA_VERSION),
TIMESTAMP);
+ MigrationTask.AdditionalInformation details = new
MigrationTask.AdditionalInformation(new SchemaVersion(SCHEMA_VERSION),
TIMESTAMP);
assertThatJson(jsonAdditionalInformationSerializer.serialize(details)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION);
}
@Test
- void additonalInformationShouldBeDeserializable() throws IOException {
- MigrationTask.AdditionalInformations details = new
MigrationTask.AdditionalInformations(new SchemaVersion(SCHEMA_VERSION),
TIMESTAMP);
+ void additionalInformationShouldBeDeserializable() throws IOException {
+ MigrationTask.AdditionalInformation details = new
MigrationTask.AdditionalInformation(new SchemaVersion(SCHEMA_VERSION),
TIMESTAMP);
assertThat(jsonAdditionalInformationSerializer.deserialize(SERIALIZED_ADDITIONAL_INFORMATION))
.isEqualToComparingFieldByField(details);
}
diff --git a/grafana-reporting/README.md b/grafana-reporting/README.md
index 1a21acd..9312bea 100644
--- a/grafana-reporting/README.md
+++ b/grafana-reporting/README.md
@@ -30,7 +30,7 @@ Note that you need to run a guice version of James.
- Statistics about Mailet / Matcher execution times
- Statistics about Mail queues
- Statistics about DNS calls
- - Some other, diverse informations on the James server internals
+ - Some other, diverse information on the James server internals
- Cassandra driver statistics
- Tika HTTP client statistics
- SpamAssassin TCP client statistics
diff --git
a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
index 8bd39aa..656e66f 100644
---
a/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
+++
b/mailbox/api/src/main/java/org/apache/james/mailbox/model/MessageResult.java
@@ -34,7 +34,7 @@ import org.apache.james.mailbox.exception.MailboxException;
/**
* <p>
- * Used to get specific informations about a Message without dealing with a
+ * Used to get specific information about a Message without dealing with a
* MimeMessage instance. Demanded information can be requested by binary
* combining the constants.
* </p>
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTaskSerializationTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTaskSerializationTest.java
index 7ee513a..a389160 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTaskSerializationTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/MailboxPathV2MigrationTaskSerializationTest.java
@@ -27,7 +27,7 @@ import static org.mockito.Mockito.mock;
import java.io.IOException;
import java.time.Instant;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.task.TaskExecutionDetails;
@@ -43,7 +43,7 @@ class MailboxPathV2MigrationTaskSerializationTest {
private static final String SERIALIZED_ADDITIONAL_INFORMATION =
"{\"type\": \"Cassandra_mailboxPathV2Migration\",
\"remainingCount\":42,\"initialCount\":10,
\"timestamp\":\"2018-11-13T12:00:55Z\"}";
private static final JsonTaskSerializer TASK_SERIALIZER = new
JsonTaskSerializer(MailboxPathV2MigrationTaskDTO.MODULE.apply(MIGRATION));
- private static final JsonTaskAdditionalInformationsSerializer
JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER = new
JsonTaskAdditionalInformationsSerializer(MailboxPathV2MigrationTaskAdditionalInformationDTO.MODULE);
+ private static final JsonTaskAdditionalInformationSerializer
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationSerializer(MailboxPathV2MigrationTaskAdditionalInformationDTO.MODULE);
@Test
void taskShouldBeSerializable() throws JsonProcessingException {
@@ -59,12 +59,12 @@ class MailboxPathV2MigrationTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws
JsonProcessingException {
-
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION);
+
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION);
}
@Test
void additonalInformationShouldBeDeserializable() throws IOException {
- TaskExecutionDetails.AdditionalInformation deserialized =
JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION);
+ TaskExecutionDetails.AdditionalInformation deserialized =
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION);
assertThat(deserialized).isInstanceOf(MailboxPathV2Migration.AdditionalInformation.class);
MailboxPathV2Migration.AdditionalInformation additionalInformation =
(MailboxPathV2Migration.AdditionalInformation) deserialized;
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskTest.java
index 575509c..9ea4707 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/task/MailboxMergingTaskTest.java
@@ -27,7 +27,7 @@ import java.io.IOException;
import java.time.Instant;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -42,7 +42,7 @@ class MailboxMergingTaskTest {
private static final MailboxMergingTaskRunner TASK_RUNNER =
mock(MailboxMergingTaskRunner.class);
private static final MailboxMergingTask TASK = new
MailboxMergingTask(TASK_RUNNER, 0L,
CASSANDRA_ID_FACTORY.fromString("3b8e5f90-b94f-20f8-ce7b-3c4aad93b90c"),
CASSANDRA_ID_FACTORY.fromString("2c7f4081-aa30-11e9-bf6c-2d3b9e84aafd"));
private static final MailboxMergingTask.Details DETAILS = new
MailboxMergingTask.Details(CASSANDRA_ID_FACTORY.fromString("3b8e5f90-b94f-20f8-ce7b-3c4aad93b90c"),
CASSANDRA_ID_FACTORY.fromString("2c7f4081-aa30-11e9-bf6c-2d3b9e84aafd"), 10,
15, 20, TIMESTAMP);
- private static final JsonTaskAdditionalInformationsSerializer
JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER = new
JsonTaskAdditionalInformationsSerializer(MailboxMergingTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
+ private static final JsonTaskAdditionalInformationSerializer
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationSerializer(MailboxMergingTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
private static final JsonTaskSerializer TESTEE = new
JsonTaskSerializer(MailboxMergingTaskDTO.module(TASK_RUNNER));
@Test
@@ -59,12 +59,12 @@ class MailboxMergingTaskTest {
@Test
void additionalInformationShouldBeSerializable() throws
JsonProcessingException {
-
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION);
+
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION);
}
@Test
void additonalInformationShouldBeDeserializable() throws IOException {
-
assertThat(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION))
+
assertThat(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION))
.isEqualToComparingFieldByField(DETAILS);
}
}
\ No newline at end of file
diff --git
a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
index f49e7f5..a1ad6b5 100644
---
a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
+++
b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/blob/BlobStoreVaultGarbageCollectionTaskSerializationTest.java
@@ -29,7 +29,7 @@ import java.time.Instant;
import java.time.ZonedDateTime;
import org.apache.james.blob.api.BucketName;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.task.Task;
@@ -57,7 +57,7 @@ class BlobStoreVaultGarbageCollectionTaskSerializationTest {
private static final String SERIALIZED_TASK =
"{\"type\":\"deletedMessages/blobStoreBasedGarbageCollection\"}";
private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK =
"{\"type\":\"deletedMessages/blobStoreBasedGarbageCollection\",
\"beginningOfRetentionPeriod\":\"2019-09-03T15:26:13.356+02:00[Europe/Paris]\",\"deletedBuckets\":[\"1\",
\"2\", \"3\"], \"timestamp\": \"2018-11-13T12:00:55Z\"}";
- private static final JsonTaskAdditionalInformationsSerializer
JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER = new
JsonTaskAdditionalInformationsSerializer(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.MODULE);
+ private static final JsonTaskAdditionalInformationSerializer
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationSerializer(BlobStoreVaultGarbageCollectionTaskAdditionalInformationDTO.MODULE);
@BeforeAll
static void setUp() {
@@ -82,12 +82,12 @@ class BlobStoreVaultGarbageCollectionTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws
JsonProcessingException {
-
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION_TASK);
+
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION_TASK);
}
@Test
void additonalInformationShouldBeDeserializable() throws IOException {
-
assertThat(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION_TASK))
+
assertThat(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION_TASK))
.isEqualToComparingFieldByField(DETAILS);
}
}
\ No newline at end of file
diff --git
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java
index fa463a8..32f86a3 100644
---
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java
+++
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/ErrorRecoveryIndexationTaskSerializationTest.java
@@ -29,7 +29,7 @@ import java.util.List;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures;
import org.apache.james.mailbox.model.TestId;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.task.Task;
import
org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask;
@@ -46,7 +46,7 @@ class ErrorRecoveryIndexationTaskSerializationTest {
private final TestId.Factory mailboxIdFactory = new TestId.Factory();
private ReIndexerPerformer reIndexerPerformer;
private JsonTaskSerializer taskSerializer;
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer;
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer;
private final int successfullyReprocessedMailCount = 42;
private final int failedReprocessedMailCount = 2;
@@ -73,7 +73,7 @@ class ErrorRecoveryIndexationTaskSerializationTest {
ErrorRecoveryIndexationTask.Factory factory = new
ErrorRecoveryIndexationTask.Factory(reIndexerPerformer, mailboxIdFactory);
taskSerializer = new
JsonTaskSerializer(ErrorRecoveryIndexationTaskDTO.module(factory));
- jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(
+ jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(
ReprocessingContextInformationForErrorRecoveryIndexationTask.serializationModule(mailboxIdFactory));
reIndexingExecutionFailures = new
ReIndexingExecutionFailures(ImmutableList.of(
diff --git
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java
index 6a54441..fcc29e1 100644
---
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java
+++
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/FullReindexingTaskSerializationTest.java
@@ -28,7 +28,7 @@ import java.time.Instant;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures;
import org.apache.james.mailbox.model.TestId;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import
org.apache.mailbox.tools.indexer.ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask;
@@ -44,7 +44,7 @@ class FullReindexingTaskSerializationTest {
private ReIndexerPerformer reIndexerPerformer;
private JsonTaskSerializer taskSerializer;
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer;
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer;
private final TestId mailboxId2 = TestId.of(2L);
private final MessageUid messageUid2 = MessageUid.of(20L);
@@ -63,7 +63,7 @@ class FullReindexingTaskSerializationTest {
reIndexerPerformer = mock(ReIndexerPerformer.class);
taskSerializer = new
JsonTaskSerializer(FullReindexingTask.module(reIndexerPerformer));
- jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(
+ jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(
ReprocessingContextInformationForFullReindexingTask.serializationModule(new
TestId.Factory()));
reIndexingExecutionFailures = new
ReIndexingExecutionFailures(ImmutableList.of(
diff --git
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskSerializationTest.java
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskSerializationTest.java
index 5c276bf..b6e88fb 100644
---
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskSerializationTest.java
+++
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/MessageIdReindexingTaskSerializationTest.java
@@ -27,7 +27,7 @@ import java.time.Instant;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.TestMessageId;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -44,12 +44,12 @@ class MessageIdReindexingTaskSerializationTest {
private final String serializedMessageIdReIndexingTask = "{\"type\":
\"MessageIdReIndexingTask\", \"messageId\": \"1\"}";
private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\":
\"MessageIdReIndexingTask\", \"messageId\": \"1\",
\"timestamp\":\"2018-11-13T12:00:55Z\"}";
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer;
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer;
@BeforeEach
void setUp() {
messageIdFactory = new TestMessageId.Factory();
- jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(
+ jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(
MessageIdReindexingTaskAdditionalInformationDTO.serializationModule(messageIdFactory));
reIndexerPerformer = mock(ReIndexerPerformer.class);
MessageIdReIndexingTask.Factory factory = new
MessageIdReIndexingTask.Factory(reIndexerPerformer, messageIdFactory);
diff --git
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskSerializationTest.java
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskSerializationTest.java
index 1be420f..872a748 100644
---
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskSerializationTest.java
+++
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMailboxReindexingTaskSerializationTest.java
@@ -29,7 +29,7 @@ import java.util.List;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures;
import org.apache.james.mailbox.model.TestId;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -43,7 +43,7 @@ class SingleMailboxReindexingTaskSerializationTest {
private ReIndexerPerformer reIndexerPerformer;
private JsonTaskSerializer taskSerializer;
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer;
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer;
private final int successfullyReprocessedMailCount = 42;
private final int failedReprocessedMailCount = 2;
@@ -67,7 +67,7 @@ class SingleMailboxReindexingTaskSerializationTest {
SingleMailboxReindexingTask.Factory factory = new
SingleMailboxReindexingTask.Factory(reIndexerPerformer, new TestId.Factory());
taskSerializer = new
JsonTaskSerializer(SingleMailboxReindexingTaskDTO.module(factory));
- jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(
+ jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(
SingleMailboxReindexingTaskAdditionalInformationDTO.serializationModule(new
TestId.Factory()));
reIndexingExecutionFailures = new
ReIndexingExecutionFailures(ImmutableList.of(
diff --git
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskSerializationTest.java
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskSerializationTest.java
index 13984bc..6579df3 100644
---
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskSerializationTest.java
+++
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/SingleMessageReindexingTaskSerializationTest.java
@@ -27,7 +27,7 @@ import java.time.Instant;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.model.TestId;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -45,7 +45,7 @@ class SingleMessageReindexingTaskSerializationTest {
private final String SERIALIZED_ADDITIONAL_INFORMATION = "{\"type\":
\"messageReIndexing\", \"mailboxId\": \"1\", \"uid\": 10,
\"timestamp\":\"2018-11-13T12:00:55Z\"}";
private final TestId mailboxId = TestId.of(1L);
private final MessageUid messageUid = MessageUid.of(10L);
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(
SingleMessageReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory));
@BeforeEach
diff --git
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/UserReindexingTaskSerializationTest.java
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/UserReindexingTaskSerializationTest.java
index cd73ac8..bc2d622 100644
---
a/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/UserReindexingTaskSerializationTest.java
+++
b/mailbox/tools/indexer/src/test/java/org/apache/mailbox/tools/indexer/UserReindexingTaskSerializationTest.java
@@ -30,7 +30,7 @@ import org.apache.james.core.User;
import org.apache.james.mailbox.MessageUid;
import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures;
import org.apache.james.mailbox.model.TestId;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -44,7 +44,7 @@ class UserReindexingTaskSerializationTest {
private ReIndexerPerformer reIndexerPerformer;
private JsonTaskSerializer taskSerializer;
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer;
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer;
private final User user = User.fromUsername("[email protected]");
private final int successfullyReprocessedMailCount = 42;
@@ -69,7 +69,7 @@ class UserReindexingTaskSerializationTest {
reIndexerPerformer = mock(ReIndexerPerformer.class);
UserReindexingTask.Factory factory = new
UserReindexingTask.Factory(reIndexerPerformer);
taskSerializer = new
JsonTaskSerializer(UserReindexingTaskDTO.module(factory));
- jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(
+ jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(
UserReindexingTaskAdditionalInformationDTO.serializationModule(new
TestId.Factory()));
reIndexingExecutionFailures = new
ReIndexingExecutionFailures(ImmutableList.of(
diff --git
a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
index 7532ece..1006bc7 100644
---
a/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
+++
b/protocols/imap/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
@@ -264,7 +264,7 @@ public abstract class ImapRequestLineReader {
* variants of ;; INBOX (e.g. "iNbOx") MUST be interpreted as INBOX ;; not
* as an astring.
*
- * Be aware that mailbox names are encoded via a modified UTF7. For more
informations RFC3501
+ * Be aware that mailbox names are encoded via a modified UTF7. For more
information RFC3501
*
*
*
diff --git
a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
index 119f42b..9802293 100644
---
a/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
+++
b/protocols/imap/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
@@ -312,7 +312,7 @@ public class StoreProcessor extends
AbstractMailboxProcessor<StoreRequest> {
}
final FetchResponse response;
- // For more informations related to the FETCH response see
+ // For more information related to the FETCH response see
//
// RFC4551 3.2. STORE and UID STORE Commands
if (silent && (unchangedSince != -1 || qresyncEnabled ||
condstoreEnabled)) {
diff --git a/server/app/src/main/resources/smtpserver.xml
b/server/app/src/main/resources/smtpserver.xml
index e01ec51..a26a06a 100644
--- a/server/app/src/main/resources/smtpserver.xml
+++ b/server/app/src/main/resources/smtpserver.xml
@@ -298,7 +298,7 @@
-->
<!-- This MessageHandler could be used to extract domain out of
the message and check -->
- <!-- this domains against uriRbllists. See http://www.surbl.org
for more informations. -->
+ <!-- this domains against uriRbllists. See http://www.surbl.org
for more information. -->
<!-- The message get rejected if a domain matched . -->
<!--
<handler
class="org.apache.james.smtpserver.fastfail.URIRBLHandler">
diff --git
a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/TaskSerializationModule.java
b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/TaskSerializationModule.java
index 39f38b0..238eb58 100644
---
a/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/TaskSerializationModule.java
+++
b/server/container/guice/cassandra-rabbitmq-guice/src/main/java/org/apache/james/modules/TaskSerializationModule.java
@@ -21,7 +21,7 @@ package org.apache.james.modules;
import java.time.Clock;
import org.apache.james.backends.cassandra.migration.MigrationTask;
-import
org.apache.james.backends.cassandra.migration.MigrationTaskAdditionalInformationsDTO;
+import
org.apache.james.backends.cassandra.migration.MigrationTaskAdditionalInformationDTO;
import org.apache.james.backends.cassandra.migration.MigrationTaskDTO;
import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
import
org.apache.james.mailbox.cassandra.mail.task.MailboxMergingTaskAdditionalInformationDTO;
@@ -34,7 +34,7 @@ import org.apache.james.queue.api.ManageableMailQueue;
import org.apache.james.rrt.cassandra.CassandraMappingsSourcesDAO;
import org.apache.james.rrt.cassandra.migration.MappingsSourcesMigration;
import
org.apache.james.rrt.cassandra.migration.MappingsSourcesMigrationTaskAdditionalInformationDTO;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
import org.apache.james.server.task.json.dto.TaskDTOModule;
@@ -91,33 +91,33 @@ import com.google.inject.multibindings.ProvidesIntoSet;
public class TaskSerializationModule extends AbstractModule {
@ProvidesIntoSet
- public EventDTOModule<?, ?> taskCreatedSerialization(JsonTaskSerializer
jsonTaskSerializer, JsonTaskAdditionalInformationsSerializer
jsonTaskAdditionalInformationsSerializer) {
- return TasksSerializationModule.CREATED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationsSerializer);
+ public EventDTOModule<?, ?> taskCreatedSerialization(JsonTaskSerializer
jsonTaskSerializer, JsonTaskAdditionalInformationSerializer
jsonTaskAdditionalInformationSerializer) {
+ return TasksSerializationModule.CREATED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationSerializer);
}
@ProvidesIntoSet
- public EventDTOModule<?, ?> taskStartedSerialization(JsonTaskSerializer
jsonTaskSerializer, JsonTaskAdditionalInformationsSerializer
jsonTaskAdditionalInformationsSerializer) {
- return TasksSerializationModule.STARTED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationsSerializer);
+ public EventDTOModule<?, ?> taskStartedSerialization(JsonTaskSerializer
jsonTaskSerializer, JsonTaskAdditionalInformationSerializer
jsonTaskAdditionalInformationSerializer) {
+ return TasksSerializationModule.STARTED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationSerializer);
}
@ProvidesIntoSet
- public EventDTOModule<?, ?>
taskCancelRequestedSerialization(JsonTaskSerializer jsonTaskSerializer,
JsonTaskAdditionalInformationsSerializer
jsonTaskAdditionalInformationsSerializer) {
- return
TasksSerializationModule.CANCEL_REQUESTED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationsSerializer);
+ public EventDTOModule<?, ?>
taskCancelRequestedSerialization(JsonTaskSerializer jsonTaskSerializer,
JsonTaskAdditionalInformationSerializer
jsonTaskAdditionalInformationSerializer) {
+ return
TasksSerializationModule.CANCEL_REQUESTED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationSerializer);
}
@ProvidesIntoSet
- public EventDTOModule<?, ?> taskCancelledSerialization(JsonTaskSerializer
jsonTaskSerializer, JsonTaskAdditionalInformationsSerializer
jsonTaskAdditionalInformationsSerializer) {
- return TasksSerializationModule.CANCELLED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationsSerializer);
+ public EventDTOModule<?, ?> taskCancelledSerialization(JsonTaskSerializer
jsonTaskSerializer, JsonTaskAdditionalInformationSerializer
jsonTaskAdditionalInformationSerializer) {
+ return TasksSerializationModule.CANCELLED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationSerializer);
}
@ProvidesIntoSet
- public EventDTOModule<?, ?> taskCompletedSerialization(JsonTaskSerializer
jsonTaskSerializer, JsonTaskAdditionalInformationsSerializer
jsonTaskAdditionalInformationsSerializer) {
- return TasksSerializationModule.COMPLETED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationsSerializer);
+ public EventDTOModule<?, ?> taskCompletedSerialization(JsonTaskSerializer
jsonTaskSerializer, JsonTaskAdditionalInformationSerializer
jsonTaskAdditionalInformationSerializer) {
+ return TasksSerializationModule.COMPLETED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationSerializer);
}
@ProvidesIntoSet
- public EventDTOModule<?, ?> taskFailedSerialization(JsonTaskSerializer
jsonTaskSerializer, JsonTaskAdditionalInformationsSerializer
jsonTaskAdditionalInformationsSerializer) {
- return TasksSerializationModule.FAILED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationsSerializer);
+ public EventDTOModule<?, ?> taskFailedSerialization(JsonTaskSerializer
jsonTaskSerializer, JsonTaskAdditionalInformationSerializer
jsonTaskAdditionalInformationSerializer) {
+ return TasksSerializationModule.FAILED.create(jsonTaskSerializer,
jsonTaskAdditionalInformationSerializer);
}
@ProvidesIntoSet
@@ -302,7 +302,7 @@ public class TaskSerializationModule extends AbstractModule
{
@ProvidesIntoSet
public AdditionalInformationDTOModule<?, ?>
migrationTaskAdditionalInformation() {
- return MigrationTaskAdditionalInformationsDTO.serializationModule();
+ return MigrationTaskAdditionalInformationDTO.serializationModule();
}
@ProvidesIntoSet
diff --git
a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
index dfbdca2..f179dfe 100644
---
a/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
+++
b/server/data/data-cassandra/src/test/java/org/apache/james/rrt/cassandra/migration/MappingsSourcesMigrationTaskSerializationTest.java
@@ -27,7 +27,7 @@ import static org.mockito.Mockito.mock;
import java.io.IOException;
import java.time.Instant;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -42,7 +42,7 @@ class MappingsSourcesMigrationTaskSerializationTest {
private static final String SERIALIZED_ADDITIONAL_INFORMATION =
"{\"type\": \"mappingsSourcesMigration\",
\"successfulMappingsCount\":42,\"errorMappingsCount\":10,\"timestamp\":\"2018-11-13T12:00:55Z\"}";
private static final JsonTaskSerializer TASK_SERIALIZER = new
JsonTaskSerializer(MappingsSourcesMigrationTaskDTO.MODULE.apply(MIGRATION));
- private static final JsonTaskAdditionalInformationsSerializer
JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER = new
JsonTaskAdditionalInformationsSerializer(MappingsSourcesMigrationTaskAdditionalInformationDTO.serializationModule(MappingsSourcesMigration.TYPE));
+ private static final JsonTaskAdditionalInformationSerializer
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationSerializer(MappingsSourcesMigrationTaskAdditionalInformationDTO.serializationModule(MappingsSourcesMigration.TYPE));
@Test
void taskShouldBeSerializable() throws JsonProcessingException {
@@ -58,12 +58,12 @@ class MappingsSourcesMigrationTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws
JsonProcessingException {
-
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION);
+
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION);
}
@Test
void additonalInformationShouldBeDeserializable() throws IOException {
-
assertThat(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION))
+
assertThat(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION))
.isEqualToComparingFieldByField(DETAILS);
}
}
\ No newline at end of file
diff --git
a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
index b4fb725..3e5ae2b 100644
---
a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
+++
b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java
@@ -78,7 +78,7 @@ final class MessageInputStream extends InputStream {
* @throws IOException
* get thrown if an IO error detected
* @throws MessagingException
- * get thrown if an error detected while reading informations
of
+ * get thrown if an error detected while reading information of
* the mail
*/
public MessageInputStream(Mail mc, StreamRepository srep, int sizeLimit,
final boolean update) throws IOException, MessagingException {
@@ -142,7 +142,7 @@ final class MessageInputStream extends InputStream {
* @throws IOException
* get thrown if an IO error detected
* @throws MessagingException
- * get thrown if an error detected while reading informations
of
+ * get thrown if an error detected while reading information of
* the mail
*/
private void writeStream(Mail mail, OutputStream out, boolean update)
throws IOException, MessagingException {
diff --git
a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
index 87873bf..d2b9dc6 100644
---
a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
+++
b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
/**
* Extract domains from message and check against URIRBLServer. For more
- * informations see <a href="http://www.surbl.org";>www.surbl.org</a>
+ * information see <a href="http://www.surbl.org";>www.surbl.org</a>
*/
public class URIRBLHandler implements JamesMessageHook, ProtocolHandler {
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskSerializationTest.java
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskSerializationTest.java
index bba39d9..c444d7d 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskSerializationTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTaskSerializationTest.java
@@ -28,7 +28,7 @@ import java.time.Instant;
import org.apache.james.core.User;
import org.apache.james.mailbox.model.MessageId;
import org.apache.james.mailbox.model.TestMessageId;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.vault.DeletedMessageVault;
import org.junit.jupiter.api.BeforeEach;
@@ -51,14 +51,14 @@ class DeletedMessagesVaultDeleteTaskSerializationTest {
private final String serializedDeleteMessagesVaultDeleteTask = "{\"type\":
\"deletedMessages/delete\", \"userName\":\"james\", \"messageId\": \"" +
messageId.serialize() + "\"}";
private final String serializedAdditionalInformation = "{\"type\":
\"deletedMessages/delete\", \"userName\":\"james\", \"messageId\": \"" +
messageId.serialize() + "\", \"timestamp\":\"2018-11-13T12:00:55Z\"}";
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer;
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer;
@BeforeEach
void setUp() {
deletedMessageVault = mock(DeletedMessageVault.class);
DeletedMessagesVaultDeleteTask.Factory factory = new
DeletedMessagesVaultDeleteTask.Factory(deletedMessageVault, messageIdFactory);
taskSerializer = new
JsonTaskSerializer(DeletedMessagesVaultDeleteTaskDTO.module(factory));
- jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.serializationModule(messageIdFactory));
+ jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(DeletedMessagesVaultDeleteTaskAdditionalInformationDTO.serializationModule(messageIdFactory));
}
@Test
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
index e62a7b2..0b59885 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskSerializationTest.java
@@ -31,7 +31,7 @@ import javax.mail.internet.AddressException;
import org.apache.james.core.MailAddress;
import org.apache.james.core.User;
import org.apache.james.mailbox.model.TestId;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.task.Task;
import org.apache.james.vault.dto.query.QueryTranslator;
@@ -65,7 +65,7 @@ class DeletedMessagesVaultExportTaskSerializationTest {
"\"exportTo\":\"[email protected]\"}\n";
private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK =
"{\"type\":\"deletedMessages/export\",
\"exportTo\":\"[email protected]\",\"userExportFrom\":\"james\",\"totalExportedMessages\":42,
\"timestamp\":\"2018-11-13T12:00:55Z\"}";
- private static final JsonTaskAdditionalInformationsSerializer
JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER = new
JsonTaskAdditionalInformationsSerializer(DeletedMessagesVaultExportTaskAdditionalInformationDTO.MODULE);
+ private static final JsonTaskAdditionalInformationSerializer
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationSerializer(DeletedMessagesVaultExportTaskAdditionalInformationDTO.MODULE);
@BeforeAll
static void init() throws AddressException {
@@ -102,19 +102,19 @@ class DeletedMessagesVaultExportTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws
JsonProcessingException {
-
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.serialize(details)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION_TASK);
+
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.serialize(details)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION_TASK);
}
@Test
void additonalInformationShouldBeDeserializable() throws IOException {
-
assertThat(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION_TASK))
+
assertThat(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION_TASK))
.isEqualToComparingFieldByField(details);
}
@Test
void additonalInformationWithInvalidMailAddressShouldThrow() throws
IOException {
String invalidSerializedAdditionalInformationTask =
"{\"type\":\"deletedMessages/export\",\"exportTo\":\"invalid\",\"userExportFrom\":\"james\",\"totalExportedMessages\":42}";;
- assertThatCode(() ->
JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.deserialize(invalidSerializedAdditionalInformationTask))
+ assertThatCode(() ->
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.deserialize(invalidSerializedAdditionalInformationTask))
.hasCauseInstanceOf(AddressException.class);
}
}
\ No newline at end of file
diff --git
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
index 50c3810..c91998b 100644
---
a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTaskSerializationTest.java
@@ -27,7 +27,7 @@ import java.time.Instant;
import org.apache.james.core.User;
import org.apache.james.mailbox.model.TestId;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.task.Task;
import org.apache.james.vault.dto.query.QueryTranslator;
@@ -59,7 +59,7 @@ class DeletedMessagesVaultRestoreTaskSerializationTest {
"}";
private static final String SERIALIZED_ADDITIONAL_INFORMATION_TASK =
"{\"type\":\"deletedMessages/restore\",
\"user\":\"james\",\"successfulRestoreCount\":42,\"errorRestoreCount\":10,
\"timestamp\":\"2018-11-13T12:00:55Z\"}";
- private static final JsonTaskAdditionalInformationsSerializer
JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER = new
JsonTaskAdditionalInformationsSerializer(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.MODULE);
+ private static final JsonTaskAdditionalInformationSerializer
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationSerializer(DeletedMessagesVaultRestoreTaskAdditionalInformationDTO.MODULE);
@BeforeEach
void setUp() {
@@ -90,12 +90,12 @@ class DeletedMessagesVaultRestoreTaskSerializationTest {
@Test
void additionalInformationShouldBeSerializable() throws
JsonProcessingException {
-
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION_TASK);
+
assertThatJson(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.serialize(DETAILS)).isEqualTo(SERIALIZED_ADDITIONAL_INFORMATION_TASK);
}
@Test
void additonalInformationShouldBeDeserializable() throws IOException {
-
assertThat(JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION_TASK))
+
assertThat(JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER.deserialize(SERIALIZED_ADDITIONAL_INFORMATION_TASK))
.isEqualToComparingFieldByField(DETAILS);
}
}
\ No newline at end of file
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java
index b7cda3c..820dfdf 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/EventDeadLettersRedeliverTaskTest.java
@@ -31,7 +31,7 @@ import java.util.stream.Stream;
import org.apache.james.mailbox.events.EventDeadLetters;
import org.apache.james.mailbox.events.GenericGroup;
import org.apache.james.mailbox.events.Group;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.task.Task;
import
org.apache.james.webadmin.service.EventDeadLettersRedeliveryTaskAdditionalInformationDTO.EventDeadLettersRedeliveryTaskAdditionalInformationForAll;
@@ -63,7 +63,7 @@ class EventDeadLettersRedeliverTaskTest {
EventDeadLettersRedeliverGroupTaskDTO.module(SERVICE),
EventDeadLettersRedeliverOneTaskDTO.module(SERVICE));
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(
EventDeadLettersRedeliveryTaskAdditionalInformationForAll.MODULE,
EventDeadLettersRedeliveryTaskAdditionalInformationForGroup.MODULE,
EventDeadLettersRedeliveryTaskAdditionalInformationForOne.MODULE);
diff --git
a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/ClearMailQueueTaskTest.java
b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/ClearMailQueueTaskTest.java
index bb6cd92..cdde343 100644
---
a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/ClearMailQueueTaskTest.java
+++
b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/ClearMailQueueTaskTest.java
@@ -30,7 +30,7 @@ import java.util.Optional;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.ManageableMailQueue;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.junit.jupiter.api.Test;
@@ -44,7 +44,7 @@ class ClearMailQueueTaskTest {
private static final String QUEUE_NAME = "anyQueue";
private static final long INITIAL_COUNT = 0L;
private static final long REMAINING_COUNT = 10L;
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(
ClearMailQueueTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
private static final String SERIALIZED_TASK_ADDITIONAL_INFORMATION =
"{\"type\": \"clear-mail-queue\",
\"mailQueueName\":\"anyQueue\",\"initialCount\":0,\"remainingCount\":10,
\"timestamp\":\"2018-11-13T12:00:55Z\"}";
diff --git
a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskTest.java
b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskTest.java
index 33092c5..098a1f6 100644
---
a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskTest.java
+++
b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/service/DeleteMailsFromMailQueueTaskTest.java
@@ -34,7 +34,7 @@ import javax.mail.internet.AddressException;
import org.apache.james.core.MailAddress;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.ManageableMailQueue;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -50,7 +50,7 @@ class DeleteMailsFromMailQueueTaskTest {
private MailQueueFactory<ManageableMailQueue> mailQueueFactory;
private ManageableMailQueue mockedQueue;
private final static String queueName = "anyQueue";
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationsSerializer = new
JsonTaskAdditionalInformationsSerializer(DeleteMailsFromMailQueueTaskAdditionalInformationDTO.MODULE);
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(DeleteMailsFromMailQueueTaskAdditionalInformationDTO.MODULE);
@BeforeEach
private void setUp() {
@@ -117,7 +117,7 @@ class DeleteMailsFromMailQueueTaskTest {
.isInstanceOf(AddressException.class);
}
- private static Stream<Arguments> validAdditionalInformations() throws
Exception {
+ private static Stream<Arguments> validAdditionalInformation() throws
Exception {
return Stream.of(
Arguments.of(10L, 5L, Optional.of(new MailAddress("[email protected]")),
Optional.empty(), Optional.empty(), "{\"type\":
\"delete-mails-from-mail-queue\", \"queue\": \"anyQueue\", \"sender\":
\"[email protected]\", \"initialCount\" : 10, \"remainingCount\":5, \"timestamp\":
\"2018-11-13T12:00:55Z\"}"),
Arguments.of(1L, 0L, Optional.empty(), Optional.of("name"),
Optional.empty(), "{\"type\": \"delete-mails-from-mail-queue\", \"queue\":
\"anyQueue\", \"name\": \"name\", \"initialCount\" : 1, \"remainingCount\":0,
\"timestamp\": \"2018-11-13T12:00:55Z\"}"),
@@ -137,11 +137,11 @@ class DeleteMailsFromMailQueueTaskTest {
ManageableMailQueue queue = mailQueueFactory.getQueue(queueName).get();
DeleteMailsFromMailQueueTask.AdditionalInformation details = new
DeleteMailsFromMailQueueTask.AdditionalInformation(queue.getName(),
initialCount, remainingCount, sender, name, recipient, TIMESTAMP);
-
assertThatJson(jsonAdditionalInformationsSerializer.serialize(details)).isEqualTo(serializedAdditionalInformationJson);
+
assertThatJson(jsonAdditionalInformationSerializer.serialize(details)).isEqualTo(serializedAdditionalInformationJson);
}
private static Stream<Arguments>
additionalInformationShouldBeSerializable() throws Exception {
- return validAdditionalInformations();
+ return validAdditionalInformation();
}
@ParameterizedTest
@@ -154,19 +154,19 @@ class DeleteMailsFromMailQueueTaskTest {
String
serializedAdditionalInformationJson) throws IOException {
DeleteMailsFromMailQueueTask.AdditionalInformation details = new
DeleteMailsFromMailQueueTask.AdditionalInformation(queueName, initialCount,
remainingCount, sender, name, recipient, TIMESTAMP);
-
assertThat(jsonAdditionalInformationsSerializer.deserialize(serializedAdditionalInformationJson))
+
assertThat(jsonAdditionalInformationSerializer.deserialize(serializedAdditionalInformationJson))
.isEqualToComparingFieldByField(details);
}
private static Stream<Arguments>
additionalInformationShouldBeDeserializable() throws Exception {
- return validAdditionalInformations();
+ return validAdditionalInformation();
}
@Test
void
additionalInformationShouldThrowWhenDeserializeAMalformedMailAddress() throws
Exception {
String serializedJson = "{\"type\": \"delete-mails-from-mail-queue\",
\"queue\": \"anyQueue\", \"sender\": \"a.b.c\", \"initialCount\" : 10,
\"remainingCount\":5}";
- assertThatThrownBy(() ->
jsonAdditionalInformationsSerializer.deserialize(serializedJson))
+ assertThatThrownBy(() ->
jsonAdditionalInformationSerializer.deserialize(serializedJson))
.isInstanceOf(AddressException.class);
}
diff --git
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskTest.java
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskTest.java
index 1505b0a..9d90357 100644
---
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskTest.java
+++
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ClearMailRepositoryTaskTest.java
@@ -30,7 +30,7 @@ import java.time.Instant;
import org.apache.james.mailrepository.api.MailRepository;
import org.apache.james.mailrepository.api.MailRepositoryPath;
import org.apache.james.mailrepository.api.MailRepositoryStore;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.junit.jupiter.api.Test;
@@ -50,7 +50,7 @@ class ClearMailRepositoryTaskTest {
private static final ClearMailRepositoryTask TASK = new
ClearMailRepositoryTask(MAIL_REPOSITORIES, MAIL_REPOSITORY_PATH);
private static final long INITIAL_COUNT = 0L;
private static final long REMAINING_COUNT = 10L;
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(
ClearMailRepositoryTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
@Test
diff --git
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskTest.java
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskTest.java
index 1910472..faea61f 100644
---
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskTest.java
+++
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingAllMailsTaskTest.java
@@ -31,7 +31,7 @@ import java.util.stream.Stream;
import org.apache.james.mailrepository.api.MailKey;
import org.apache.james.mailrepository.api.MailRepositoryPath;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -44,7 +44,7 @@ class ReprocessingAllMailsTaskTest {
private static final Instant TIMESTAMP =
Instant.parse("2018-11-13T12:00:55Z");
private static final ReprocessingService REPROCESSING_SERVICE =
mock(ReprocessingService.class);
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(ReprocessingAllMailsTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(ReprocessingAllMailsTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
private static final long REPOSITORY_SIZE = 5L;
private static final MailRepositoryPath REPOSITORY_PATH =
MailRepositoryPath.from("a");
private static final String TARGET_QUEUE = "queue";
@@ -107,7 +107,7 @@ class ReprocessingAllMailsTaskTest {
.isInstanceOf(ReprocessingAllMailsTask.InvalidMailRepositoryPathDeserializationException.class);
}
- private static Stream<Arguments> allAdditionalInformations() {
+ private static Stream<Arguments> allAdditionalInformation() {
return Stream.of(
Arguments.of(REPOSITORY_PATH, TARGET_QUEUE, SOME_TARGET_PROCESSOR,
REPOSITORY_SIZE, REMAINING_COUNT,
SERIALIZED_TASK_ADDITIONAL_INFORMATION_WITH_TARGET_PROCESSOR),
Arguments.of(REPOSITORY_PATH, TARGET_QUEUE, Optional.empty(),
REPOSITORY_SIZE, REMAINING_COUNT,
SERIALIZED_TASK_ADDITIONAL_INFORMATION_WITHOUT_TARGET_PROCESSOR)
@@ -128,7 +128,7 @@ class ReprocessingAllMailsTaskTest {
}
private static Stream<Arguments>
additionalInformationShouldBeSerializable() {
- return allAdditionalInformations();
+ return allAdditionalInformation();
}
@ParameterizedTest
@@ -145,6 +145,6 @@ class ReprocessingAllMailsTaskTest {
}
private static Stream<Arguments>
additionalInformationShouldBeDeserializable() {
- return allAdditionalInformations();
+ return allAdditionalInformation();
}
}
\ No newline at end of file
diff --git
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskTest.java
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskTest.java
index 51248b8..2e6e189 100644
---
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskTest.java
+++
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingOneMailTaskTest.java
@@ -33,7 +33,7 @@ import java.util.stream.Stream;
import org.apache.james.mailrepository.api.MailKey;
import org.apache.james.mailrepository.api.MailRepositoryPath;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -55,7 +55,7 @@ class ReprocessingOneMailTaskTest {
private static final String TARGET_QUEUE = "queue";
private static final MailKey MAIL_KEY = new MailKey("myMail");
private static final Optional<String> TARGET_PROCESSOR =
Optional.of("targetProcessor");
- private JsonTaskAdditionalInformationsSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationsSerializer(ReprocessingOneMailTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
+ private JsonTaskAdditionalInformationSerializer
jsonAdditionalInformationSerializer = new
JsonTaskAdditionalInformationSerializer(ReprocessingOneMailTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
@ParameterizedTest
@MethodSource
diff --git
a/server/task/task-api/src/test/java/org/apache/james/task/MemoryReferenceWithCounterTask.java
b/server/task/task-api/src/test/java/org/apache/james/task/MemoryReferenceWithCounterTask.java
index eff246c..c8e9953 100644
---
a/server/task/task-api/src/test/java/org/apache/james/task/MemoryReferenceWithCounterTask.java
+++
b/server/task/task-api/src/test/java/org/apache/james/task/MemoryReferenceWithCounterTask.java
@@ -35,7 +35,7 @@ import com.google.common.base.MoreObjects;
* On deserialization, we can then ask the store to retrieve the Task object
and pretend we deserialized it.
*
* This task is very similar to `MemoryReferenceTask` but it accepts an
`AtomicLong` as parameter
- * which will be used for its additional informations.
+ * which will be used for its additional information.
*
* This task enables to unit test the update/serialization of the additional
information when using the task manager.
*/
diff --git
a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TasksSerializationModule.java
b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TasksSerializationModule.java
index ed2a80a..22ad061 100644
---
a/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TasksSerializationModule.java
+++
b/server/task/task-distributed/src/main/java/org/apache/james/task/eventsourcing/distributed/TasksSerializationModule.java
@@ -24,7 +24,7 @@ import java.util.function.BiFunction;
import java.util.stream.Stream;
import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.task.eventsourcing.AdditionalInformationUpdated;
import org.apache.james.task.eventsourcing.CancelRequested;
@@ -40,10 +40,10 @@ import com.github.steveash.guavate.Guavate;
public interface TasksSerializationModule {
@FunctionalInterface
interface TaskSerializationModuleFactory<T extends TaskEvent, U extends
TaskEventDTO> {
- EventDTOModule<T, U> create(JsonTaskSerializer taskSerializer,
JsonTaskAdditionalInformationsSerializer additionalInformationsSerializer);
+ EventDTOModule<T, U> create(JsonTaskSerializer taskSerializer,
JsonTaskAdditionalInformationSerializer additionalInformationSerializer);
}
- TaskSerializationModuleFactory<Created, CreatedDTO> CREATED =
(jsonTaskSerializer, jsonTaskAdditionalInformationsSerializer) -> EventDTOModule
+ TaskSerializationModuleFactory<Created, CreatedDTO> CREATED =
(jsonTaskSerializer, jsonTaskAdditionalInformationSerializer) -> EventDTOModule
.forEvent(Created.class)
.convertToDTO(CreatedDTO.class)
.toDomainObjectConverter(dto -> dto.toDomainObject(jsonTaskSerializer))
@@ -51,7 +51,7 @@ public interface TasksSerializationModule {
.typeName("task-manager-created")
.withFactory(EventDTOModule::new);
- TaskSerializationModuleFactory<Started, StartedDTO> STARTED =
(jsonTaskSerializer, jsonTaskAdditionalInformationsSerializer) -> EventDTOModule
+ TaskSerializationModuleFactory<Started, StartedDTO> STARTED =
(jsonTaskSerializer, jsonTaskAdditionalInformationSerializer) -> EventDTOModule
.forEvent(Started.class)
.convertToDTO(StartedDTO.class)
.toDomainObjectConverter(StartedDTO::toDomainObject)
@@ -59,7 +59,7 @@ public interface TasksSerializationModule {
.typeName("task-manager-started")
.withFactory(EventDTOModule::new);
- TaskSerializationModuleFactory<CancelRequested, CancelRequestedDTO>
CANCEL_REQUESTED = (jsonTaskSerializer,
jsonTaskAdditionalInformationsSerializer) -> EventDTOModule
+ TaskSerializationModuleFactory<CancelRequested, CancelRequestedDTO>
CANCEL_REQUESTED = (jsonTaskSerializer,
jsonTaskAdditionalInformationSerializer) -> EventDTOModule
.forEvent(CancelRequested.class)
.convertToDTO(CancelRequestedDTO.class)
.toDomainObjectConverter(CancelRequestedDTO::toDomainObject)
@@ -67,40 +67,40 @@ public interface TasksSerializationModule {
.typeName("task-manager-cancel-requested")
.withFactory(EventDTOModule::new);
- TaskSerializationModuleFactory<Completed, CompletedDTO> COMPLETED =
(jsonTaskSerializer, jsonTaskAdditionalInformationsSerializer) -> EventDTOModule
+ TaskSerializationModuleFactory<Completed, CompletedDTO> COMPLETED =
(jsonTaskSerializer, jsonTaskAdditionalInformationSerializer) -> EventDTOModule
.forEvent(Completed.class)
.convertToDTO(CompletedDTO.class)
- .toDomainObjectConverter(dto ->
dto.toDomainObject(jsonTaskAdditionalInformationsSerializer))
- .toDTOConverter((event, typeName) ->
CompletedDTO.fromDomainObject(jsonTaskAdditionalInformationsSerializer, event,
typeName))
+ .toDomainObjectConverter(dto ->
dto.toDomainObject(jsonTaskAdditionalInformationSerializer))
+ .toDTOConverter((event, typeName) ->
CompletedDTO.fromDomainObject(jsonTaskAdditionalInformationSerializer, event,
typeName))
.typeName("task-manager-completed")
.withFactory(EventDTOModule::new);
- TaskSerializationModuleFactory<Failed, FailedDTO> FAILED =
(jsonTaskSerializer, jsonTaskAdditionalInformationsSerializer) -> EventDTOModule
+ TaskSerializationModuleFactory<Failed, FailedDTO> FAILED =
(jsonTaskSerializer, jsonTaskAdditionalInformationSerializer) -> EventDTOModule
.forEvent(Failed.class)
.convertToDTO(FailedDTO.class)
- .toDomainObjectConverter(dto ->
dto.toDomainObject(jsonTaskAdditionalInformationsSerializer))
- .toDTOConverter((event, typeName) ->
FailedDTO.fromDomainObject(jsonTaskAdditionalInformationsSerializer, event,
typeName))
+ .toDomainObjectConverter(dto ->
dto.toDomainObject(jsonTaskAdditionalInformationSerializer))
+ .toDTOConverter((event, typeName) ->
FailedDTO.fromDomainObject(jsonTaskAdditionalInformationSerializer, event,
typeName))
.typeName("task-manager-failed")
.withFactory(EventDTOModule::new);
- TaskSerializationModuleFactory<Cancelled, CancelledDTO> CANCELLED =
(jsonTaskSerializer, jsonTaskAdditionalInformationsSerializer) -> EventDTOModule
+ TaskSerializationModuleFactory<Cancelled, CancelledDTO> CANCELLED =
(jsonTaskSerializer, jsonTaskAdditionalInformationSerializer) -> EventDTOModule
.forEvent(Cancelled.class)
.convertToDTO(CancelledDTO.class)
- .toDomainObjectConverter(dto ->
dto.toDomainObject(jsonTaskAdditionalInformationsSerializer))
- .toDTOConverter((event, typeName) ->
CancelledDTO.fromDomainObject(jsonTaskAdditionalInformationsSerializer, event,
typeName))
+ .toDomainObjectConverter(dto ->
dto.toDomainObject(jsonTaskAdditionalInformationSerializer))
+ .toDTOConverter((event, typeName) ->
CancelledDTO.fromDomainObject(jsonTaskAdditionalInformationSerializer, event,
typeName))
.typeName("task-manager-cancelled")
.withFactory(EventDTOModule::new);
- TaskSerializationModuleFactory<AdditionalInformationUpdated,
AdditionalInformationUpdatedDTO> UPDATED = (jsonTaskSerializer,
jsonTaskAdditionalInformationsSerializer) -> EventDTOModule
+ TaskSerializationModuleFactory<AdditionalInformationUpdated,
AdditionalInformationUpdatedDTO> UPDATED = (jsonTaskSerializer,
jsonTaskAdditionalInformationSerializer) -> EventDTOModule
.forEvent(AdditionalInformationUpdated.class)
.convertToDTO(AdditionalInformationUpdatedDTO.class)
- .toDomainObjectConverter(dto ->
dto.toDomainObject(jsonTaskAdditionalInformationsSerializer))
- .toDTOConverter((event, typeName) ->
AdditionalInformationUpdatedDTO.fromDomainObject(jsonTaskAdditionalInformationsSerializer,
event, typeName))
+ .toDomainObjectConverter(dto ->
dto.toDomainObject(jsonTaskAdditionalInformationSerializer))
+ .toDTOConverter((event, typeName) ->
AdditionalInformationUpdatedDTO.fromDomainObject(jsonTaskAdditionalInformationSerializer,
event, typeName))
.typeName("task-manager-updated")
.withFactory(EventDTOModule::new);
- BiFunction<JsonTaskSerializer, JsonTaskAdditionalInformationsSerializer,
List<EventDTOModule<?, ?>>> MODULES = (jsonTaskSerializer,
jsonTaskAdditionalInformationsSerializer) -> Stream
+ BiFunction<JsonTaskSerializer, JsonTaskAdditionalInformationSerializer,
List<EventDTOModule<?, ?>>> MODULES = (jsonTaskSerializer,
jsonTaskAdditionalInformationSerializer) -> Stream
.of(CREATED, STARTED, CANCEL_REQUESTED, CANCELLED, COMPLETED, FAILED,
UPDATED)
- .map(moduleFactory -> moduleFactory.create(jsonTaskSerializer,
jsonTaskAdditionalInformationsSerializer))
+ .map(moduleFactory -> moduleFactory.create(jsonTaskSerializer,
jsonTaskAdditionalInformationSerializer))
.collect(Guavate.toImmutableList());
}
diff --git
a/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAO.scala
b/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAO.scala
index 31d521a..fad2b48 100644
---
a/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAO.scala
+++
b/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAO.scala
@@ -26,12 +26,12 @@ import com.datastax.driver.core.{Row, Session}
import javax.inject.Inject
import org.apache.james.backends.cassandra.init.{CassandraTypesProvider,
CassandraZonedDateTimeModule}
import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer
import
org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjectionTable._
import org.apache.james.task.{Hostname, TaskExecutionDetails, TaskId,
TaskManager, TaskType}
import reactor.core.publisher.{Flux, Mono}
-class CassandraTaskExecutionDetailsProjectionDAO @Inject()(session: Session,
typesProvider: CassandraTypesProvider,
jsonTaskAdditionalInformationsSerializer:
JsonTaskAdditionalInformationsSerializer) {
+class CassandraTaskExecutionDetailsProjectionDAO @Inject()(session: Session,
typesProvider: CassandraTypesProvider, jsonTaskAdditionalInformationSerializer:
JsonTaskAdditionalInformationSerializer) {
private val cassandraAsyncExecutor = new CassandraAsyncExecutor(session)
private val dateType =
typesProvider.getDefinedUserType(CassandraZonedDateTimeModule.ZONED_DATE_TIME)
@@ -68,11 +68,11 @@ class CassandraTaskExecutionDetailsProjectionDAO
@Inject()(session: Session, typ
.setUDTValue(CANCELED_DATE, CassandraZonedDateTimeModule.toUDT(dateType,
details.getCanceledDate).orElse(null))
.setString(CANCEL_REQUESTED_NODE,
details.getCancelRequestedNode.map[String](_.asString).orElse(null))
.setUDTValue(FAILED_DATE, CassandraZonedDateTimeModule.toUDT(dateType,
details.getStartedDate).orElse(null))
- .setString(ADDITIONAL_INFORMATION,
serializeAdditionalInformations(details).orElse(null)))
+ .setString(ADDITIONAL_INFORMATION,
serializeAdditionalInformation(details).orElse(null)))
- private def serializeAdditionalInformations(details: TaskExecutionDetails):
Optional[String] = details
+ private def serializeAdditionalInformation(details: TaskExecutionDetails):
Optional[String] = details
.getAdditionalInformation
- .map(jsonTaskAdditionalInformationsSerializer.serialize)
+ .map(jsonTaskAdditionalInformationSerializer.serialize)
def readDetails(taskId: TaskId): Mono[TaskExecutionDetails] =
cassandraAsyncExecutor
.executeSingleRow(selectStatement.bind().setUUID(TASK_ID, taskId.getValue))
@@ -96,12 +96,12 @@ class CassandraTaskExecutionDetailsProjectionDAO
@Inject()(session: Session, typ
canceledDate =
CassandraZonedDateTimeModule.fromUDTOptional(row.getUDTValue(CANCELED_DATE)),
cancelRequestedNode =
Optional.ofNullable(row.getString(CANCEL_REQUESTED_NODE)).map(Hostname(_)),
failedDate =
CassandraZonedDateTimeModule.fromUDTOptional(row.getUDTValue(FAILED_DATE)),
- additionalInformation = () =>
deserializeAdditionalInformations(taskType, row),
+ additionalInformation = () => deserializeAdditionalInformation(taskType,
row),
)
}
- private def deserializeAdditionalInformations(taskType: TaskType, row: Row):
Optional[TaskExecutionDetails.AdditionalInformation] = {
+ private def deserializeAdditionalInformation(taskType: TaskType, row: Row):
Optional[TaskExecutionDetails.AdditionalInformation] = {
Optional.ofNullable(row.getString(ADDITIONAL_INFORMATION))
- .map(additionalInformation =>
jsonTaskAdditionalInformationsSerializer.deserialize(additionalInformation))
+ .map(additionalInformation =>
jsonTaskAdditionalInformationSerializer.deserialize(additionalInformation))
}
}
diff --git
a/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/distributed/TaskEventDTO.scala
b/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/distributed/TaskEventDTO.scala
index 4730a4c..fb0e104 100644
---
a/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/distributed/TaskEventDTO.scala
+++
b/server/task/task-distributed/src/main/scala/org/apache/james/task/eventsourcing/distributed/TaskEventDTO.scala
@@ -24,7 +24,7 @@ import java.util.Optional
import com.fasterxml.jackson.annotation.JsonProperty
import org.apache.james.eventsourcing.EventId
import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTO
-import
org.apache.james.server.task.json.{JsonTaskAdditionalInformationsSerializer,
JsonTaskSerializer}
+import
org.apache.james.server.task.json.{JsonTaskAdditionalInformationSerializer,
JsonTaskSerializer}
import org.apache.james.task.eventsourcing._
import org.apache.james.task.{Hostname, Task, TaskId}
@@ -81,8 +81,8 @@ case class CompletedDTO(@JsonProperty("type") typeName:
String,
@JsonProperty("result") getResult: String,
@JsonProperty("additionalInformation")
getAdditionalInformation: Optional[String])
extends TaskEventDTO(typeName, aggregateId, eventId) {
- def toDomainObject(jsonTaskAdditionalInformationsSerializer:
JsonTaskAdditionalInformationsSerializer): Completed = {
- val deserializedAdditionalInformation =
getAdditionalInformation.asScala.map(jsonTaskAdditionalInformationsSerializer.deserialize)
+ def toDomainObject(jsonTaskAdditionalInformationSerializer:
JsonTaskAdditionalInformationSerializer): Completed = {
+ val deserializedAdditionalInformation =
getAdditionalInformation.asScala.map(jsonTaskAdditionalInformationSerializer.deserialize)
Completed(domainAggregateId, domainEventId, domainResult,
deserializedAdditionalInformation)
}
@@ -93,9 +93,9 @@ case class CompletedDTO(@JsonProperty("type") typeName:
String,
}
object CompletedDTO {
- def fromDomainObject(jsonTaskAdditionalInformationsSerializer:
JsonTaskAdditionalInformationsSerializer)(event: Completed, typeName: String):
CompletedDTO = {
- val serializedAdditionalInformations =
event.additionalInformation.map(jsonTaskAdditionalInformationsSerializer.serialize).asJava
- CompletedDTO(typeName, event.aggregateId.taskId.asString(),
event.eventId.serialize(), resultToString(event.result),
serializedAdditionalInformations)
+ def fromDomainObject(jsonTaskAdditionalInformationSerializer:
JsonTaskAdditionalInformationSerializer)(event: Completed, typeName: String):
CompletedDTO = {
+ val serializedAdditionalInformation =
event.additionalInformation.map(jsonTaskAdditionalInformationSerializer.serialize).asJava
+ CompletedDTO(typeName, event.aggregateId.taskId.asString(),
event.eventId.serialize(), resultToString(event.result),
serializedAdditionalInformation)
}
private def resultToString(result: Task.Result): String = result match {
@@ -111,16 +111,16 @@ case class FailedDTO(@JsonProperty("type") typeName:
String,
@JsonProperty("errorMessage") getErrorMessage:
Optional[String],
@JsonProperty("exception") getException: Optional[String])
extends TaskEventDTO(typeName, aggregateId, eventId) {
- def toDomainObject(jsonTaskAdditionalInformationsSerializer:
JsonTaskAdditionalInformationsSerializer): Failed = {
- val deserializedAdditionalInformation =
getAdditionalInformation.asScala.map(jsonTaskAdditionalInformationsSerializer.deserialize)
+ def toDomainObject(jsonTaskAdditionalInformationSerializer:
JsonTaskAdditionalInformationSerializer): Failed = {
+ val deserializedAdditionalInformation =
getAdditionalInformation.asScala.map(jsonTaskAdditionalInformationSerializer.deserialize)
Failed(domainAggregateId, domainEventId,
deserializedAdditionalInformation, getErrorMessage.asScala,
getException.asScala)
}
}
object FailedDTO {
- def fromDomainObject(jsonTaskAdditionalInformationsSerializer:
JsonTaskAdditionalInformationsSerializer)(event: Failed, typeName: String):
FailedDTO = {
- val serializedAdditionalInformations =
event.additionalInformation.map(jsonTaskAdditionalInformationsSerializer.serialize).asJava
- FailedDTO(typeName, event.aggregateId.taskId.asString(),
event.eventId.serialize(), serializedAdditionalInformations,
event.errorMessage.asJava, event.exception.asJava)
+ def fromDomainObject(jsonTaskAdditionalInformationSerializer:
JsonTaskAdditionalInformationSerializer)(event: Failed, typeName: String):
FailedDTO = {
+ val serializedAdditionalInformation =
event.additionalInformation.map(jsonTaskAdditionalInformationSerializer.serialize).asJava
+ FailedDTO(typeName, event.aggregateId.taskId.asString(),
event.eventId.serialize(), serializedAdditionalInformation,
event.errorMessage.asJava, event.exception.asJava)
}
}
@@ -129,16 +129,16 @@ case class CancelledDTO(@JsonProperty("type") typeName:
String,
@JsonProperty("event") eventId: Int,
@JsonProperty("additionalInformation")
getAdditionalInformation: Optional[String])
extends TaskEventDTO(typeName, aggregateId, eventId) {
- def toDomainObject(jsonTaskAdditionalInformationsSerializer:
JsonTaskAdditionalInformationsSerializer): Cancelled = {
- val deserializedAdditionalInformation =
getAdditionalInformation.asScala.map(jsonTaskAdditionalInformationsSerializer.deserialize)
+ def toDomainObject(jsonTaskAdditionalInformationSerializer:
JsonTaskAdditionalInformationSerializer): Cancelled = {
+ val deserializedAdditionalInformation =
getAdditionalInformation.asScala.map(jsonTaskAdditionalInformationSerializer.deserialize)
Cancelled(domainAggregateId, domainEventId,
deserializedAdditionalInformation)
}
}
object CancelledDTO {
- def fromDomainObject(jsonTaskAdditionalInformationsSerializer:
JsonTaskAdditionalInformationsSerializer)(event: Cancelled, typeName: String):
CancelledDTO = {
- val serializedAdditionalInformations =
event.additionalInformation.map(jsonTaskAdditionalInformationsSerializer.serialize).asJava
- CancelledDTO(typeName, event.aggregateId.taskId.asString(),
event.eventId.serialize(), serializedAdditionalInformations)
+ def fromDomainObject(jsonTaskAdditionalInformationSerializer:
JsonTaskAdditionalInformationSerializer)(event: Cancelled, typeName: String):
CancelledDTO = {
+ val serializedAdditionalInformation =
event.additionalInformation.map(jsonTaskAdditionalInformationSerializer.serialize).asJava
+ CancelledDTO(typeName, event.aggregateId.taskId.asString(),
event.eventId.serialize(), serializedAdditionalInformation)
}
}
@@ -147,15 +147,15 @@ case class
AdditionalInformationUpdatedDTO(@JsonProperty("type") typeName: Strin
@JsonProperty("event") eventId: Int,
@JsonProperty("additionalInformation")
getAdditionalInformation: String)
extends TaskEventDTO(typeName, aggregateId, eventId) {
- def toDomainObject(jsonTaskAdditionalInformationsSerializer:
JsonTaskAdditionalInformationsSerializer): AdditionalInformationUpdated = {
- val deserializedAdditionalInformation =
jsonTaskAdditionalInformationsSerializer.deserialize(getAdditionalInformation)
+ def toDomainObject(jsonTaskAdditionalInformationSerializer:
JsonTaskAdditionalInformationSerializer): AdditionalInformationUpdated = {
+ val deserializedAdditionalInformation =
jsonTaskAdditionalInformationSerializer.deserialize(getAdditionalInformation)
AdditionalInformationUpdated(domainAggregateId, domainEventId,
deserializedAdditionalInformation)
}
}
object AdditionalInformationUpdatedDTO {
- def fromDomainObject(jsonTaskAdditionalInformationsSerializer:
JsonTaskAdditionalInformationsSerializer)(event: AdditionalInformationUpdated,
typeName: String): AdditionalInformationUpdatedDTO = {
- val serializedAdditionalInformations =
jsonTaskAdditionalInformationsSerializer.serialize(event.additionalInformation)
- AdditionalInformationUpdatedDTO(typeName,
event.aggregateId.taskId.asString(), event.eventId.serialize(),
serializedAdditionalInformations)
+ def fromDomainObject(jsonTaskAdditionalInformationSerializer:
JsonTaskAdditionalInformationSerializer)(event: AdditionalInformationUpdated,
typeName: String): AdditionalInformationUpdatedDTO = {
+ val serializedAdditionalInformation =
jsonTaskAdditionalInformationSerializer.serialize(event.additionalInformation)
+ AdditionalInformationUpdatedDTO(typeName,
event.aggregateId.taskId.asString(), event.eventId.serialize(),
serializedAdditionalInformation)
}
}
diff --git
a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAOTest.java
b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAOTest.java
index 9b5940f..7481417 100644
---
a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAOTest.java
+++
b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionDAOTest.java
@@ -35,7 +35,7 @@ import
org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.CassandraZonedDateTimeModule;
import
org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.task.TaskExecutionDetails;
import
org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjectionDAO;
import org.junit.jupiter.api.BeforeEach;
@@ -48,13 +48,13 @@ class CassandraTaskExecutionDetailsProjectionDAOTest {
@RegisterExtension
static CassandraClusterExtension cassandraCluster = new
CassandraClusterExtension(
CassandraModule.aggregateModules(CassandraSchemaVersionModule.MODULE,
CassandraZonedDateTimeModule.MODULE,
CassandraTaskExecutionDetailsProjectionModule.MODULE()));
- private static final JsonTaskAdditionalInformationsSerializer
jsonTaskAdditionalInformationsSerializer = new
JsonTaskAdditionalInformationsSerializer();
+ private static final JsonTaskAdditionalInformationSerializer
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationSerializer();
private CassandraTaskExecutionDetailsProjectionDAO testee;
@BeforeEach
void setUp(CassandraCluster cassandra) {
- testee = new
CassandraTaskExecutionDetailsProjectionDAO(cassandra.getConf(),
cassandra.getTypesProvider(), jsonTaskAdditionalInformationsSerializer);
+ testee = new
CassandraTaskExecutionDetailsProjectionDAO(cassandra.getConf(),
cassandra.getTypesProvider(), JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER);
}
@Test
@@ -66,7 +66,7 @@ class CassandraTaskExecutionDetailsProjectionDAOTest {
}
@Test
- @Disabled("Serialization and deserialization of additionalInformations is
not implemented")
+ @Disabled("Serialization and deserialization of additionalInformation is
not implemented")
void
readDetailsShouldBeAbleToRetrieveASavedRecordWithAdditionalInformation() {
testee.saveDetails(TASK_EXECUTION_DETAILS_WITH_ADDITIONAL_INFORMATION()).block();
diff --git
a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionTest.java
b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionTest.java
index 35af6f8..a2dcf15 100644
---
a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionTest.java
+++
b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/cassandra/CassandraTaskExecutionDetailsProjectionTest.java
@@ -26,7 +26,7 @@ import
org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.apache.james.backends.cassandra.components.CassandraModule;
import org.apache.james.backends.cassandra.init.CassandraZonedDateTimeModule;
import
org.apache.james.backends.cassandra.versions.CassandraSchemaVersionModule;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import
org.apache.james.server.task.json.dto.MemoryReferenceWithCounterTaskAdditionalInformationDTO;
import org.apache.james.task.eventsourcing.TaskExecutionDetailsProjection;
import
org.apache.james.task.eventsourcing.TaskExecutionDetailsProjectionContract;
@@ -34,8 +34,6 @@ import
org.apache.james.task.eventsourcing.TaskExecutionDetailsProjectionContrac
import
org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjection;
import
org.apache.james.task.eventsourcing.cassandra.CassandraTaskExecutionDetailsProjectionDAO;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
class CassandraTaskExecutionDetailsProjectionTest implements
TaskExecutionDetailsProjectionContract {
@@ -43,13 +41,13 @@ class CassandraTaskExecutionDetailsProjectionTest
implements TaskExecutionDetail
@RegisterExtension
static CassandraClusterExtension cassandraCluster = new
CassandraClusterExtension(
CassandraModule.aggregateModules(CassandraSchemaVersionModule.MODULE,
CassandraZonedDateTimeModule.MODULE,
CassandraTaskExecutionDetailsProjectionModule.MODULE()));
- private static final JsonTaskAdditionalInformationsSerializer
jsonTaskAdditionalInformationsSerializer = new
JsonTaskAdditionalInformationsSerializer(MemoryReferenceWithCounterTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
+ private static final JsonTaskAdditionalInformationSerializer
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationSerializer(MemoryReferenceWithCounterTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
private Supplier<CassandraTaskExecutionDetailsProjection> testeeSupplier;
@BeforeEach
void setUp(CassandraCluster cassandra) {
- CassandraTaskExecutionDetailsProjectionDAO
cassandraTaskExecutionDetailsProjectionDAO = new
CassandraTaskExecutionDetailsProjectionDAO(cassandra.getConf(),
cassandra.getTypesProvider(), jsonTaskAdditionalInformationsSerializer);
+ CassandraTaskExecutionDetailsProjectionDAO
cassandraTaskExecutionDetailsProjectionDAO = new
CassandraTaskExecutionDetailsProjectionDAO(cassandra.getConf(),
cassandra.getTypesProvider(), JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER);
testeeSupplier = () -> new
CassandraTaskExecutionDetailsProjection(cassandraTaskExecutionDetailsProjectionDAO);
}
diff --git
a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java
b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java
index 3f4be63..42f6f25 100644
---
a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java
+++
b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/DistributedTaskManagerTest.java
@@ -41,7 +41,7 @@ import
org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreEx
import
org.apache.james.eventsourcing.eventstore.cassandra.CassandraEventStoreModule;
import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.server.task.json.dto.MemoryReferenceTaskStore;
import
org.apache.james.server.task.json.dto.MemoryReferenceWithCounterTaskAdditionalInformationDTO;
@@ -104,11 +104,11 @@ class DistributedTaskManagerTest implements
TaskManagerContract {
TestTaskDTOModules.MEMORY_REFERENCE_WITH_COUNTER_TASK_MODULE.apply(new
MemoryReferenceWithCounterTaskStore())
);
- private static final JsonTaskAdditionalInformationsSerializer
jsonTaskAdditionalInformationsSerializer = new
JsonTaskAdditionalInformationsSerializer(MemoryReferenceWithCounterTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
+ private static final JsonTaskAdditionalInformationSerializer
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationSerializer(MemoryReferenceWithCounterTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
private static final Hostname HOSTNAME = new Hostname("foo");
private static final Hostname HOSTNAME_2 = new Hostname("bar");
- private static final Set<EventDTOModule<?, ?>> MODULES =
TasksSerializationModule.MODULES.apply(TASK_SERIALIZER,
jsonTaskAdditionalInformationsSerializer).stream().collect(Guavate.toImmutableSet());
+ private static final Set<EventDTOModule<?, ?>> MODULES =
TasksSerializationModule.MODULES.apply(TASK_SERIALIZER,
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER).stream().collect(Guavate.toImmutableSet());
private static final JsonEventSerializer EVENT_SERIALIZER = new
JsonEventSerializer(MODULES);
@@ -129,7 +129,7 @@ class DistributedTaskManagerTest implements
TaskManagerContract {
static CountDownLatchExtension countDownLatchExtension = new
CountDownLatchExtension();
private final CassandraCluster cassandra =
cassandraCluster.getCassandraCluster();
- private final CassandraTaskExecutionDetailsProjectionDAO
cassandraTaskExecutionDetailsProjectionDAO = new
CassandraTaskExecutionDetailsProjectionDAO(cassandra.getConf(),
cassandra.getTypesProvider(), jsonTaskAdditionalInformationsSerializer);
+ private final CassandraTaskExecutionDetailsProjectionDAO
cassandraTaskExecutionDetailsProjectionDAO = new
CassandraTaskExecutionDetailsProjectionDAO(cassandra.getConf(),
cassandra.getTypesProvider(), JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER);
private final TaskExecutionDetailsProjection executionDetailsProjection =
new
CassandraTaskExecutionDetailsProjection(cassandraTaskExecutionDetailsProjectionDAO);
private TrackedRabbitMQWorkQueueSupplier workQueueSupplier;
diff --git
a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriberTest.java
b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriberTest.java
index 1d60395..d878c69 100644
---
a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriberTest.java
+++
b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/RabbitMQTerminationSubscriberTest.java
@@ -31,7 +31,7 @@ import org.apache.james.backends.rabbitmq.RabbitMQExtension;
import org.apache.james.eventsourcing.Event;
import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import org.apache.james.task.eventsourcing.TerminationSubscriber;
import org.apache.james.task.eventsourcing.TerminationSubscriberContract;
@@ -44,8 +44,8 @@ import reactor.core.publisher.Flux;
class RabbitMQTerminationSubscriberTest implements
TerminationSubscriberContract {
private static final JsonTaskSerializer TASK_SERIALIZER = new
JsonTaskSerializer();
- private static final JsonTaskAdditionalInformationsSerializer
JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER = new
JsonTaskAdditionalInformationsSerializer();
- private static final Set<EventDTOModule<?, ?>> MODULES =
TasksSerializationModule.MODULES.apply(TASK_SERIALIZER,
JSON_TASK_ADDITIONAL_INFORMATIONS_SERIALIZER).stream().collect(Guavate.toImmutableSet());
+ private static final JsonTaskAdditionalInformationSerializer
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationSerializer();
+ private static final Set<EventDTOModule<?, ?>> MODULES =
TasksSerializationModule.MODULES.apply(TASK_SERIALIZER,
JSON_TASK_ADDITIONAL_INFORMATION_SERIALIZER).stream().collect(Guavate.toImmutableSet());
private static final JsonEventSerializer SERIALIZER = new
JsonEventSerializer(MODULES);
@RegisterExtension
diff --git
a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/TaskEventsSerializationTest.java
b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/TaskEventsSerializationTest.java
index 63901b9..aba2449 100644
---
a/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/TaskEventsSerializationTest.java
+++
b/server/task/task-distributed/src/test/java/org/apache/james/task/eventsourcing/distributed/TaskEventsSerializationTest.java
@@ -28,7 +28,7 @@ import java.util.stream.Stream;
import org.apache.james.eventsourcing.EventId;
import org.apache.james.eventsourcing.eventstore.cassandra.JsonEventSerializer;
import org.apache.james.eventsourcing.eventstore.cassandra.dto.EventDTOModule;
-import
org.apache.james.server.task.json.JsonTaskAdditionalInformationsSerializer;
+import
org.apache.james.server.task.json.JsonTaskAdditionalInformationSerializer;
import org.apache.james.server.task.json.JsonTaskSerializer;
import
org.apache.james.server.task.json.dto.MemoryReferenceWithCounterTaskAdditionalInformationDTO;
import
org.apache.james.server.task.json.dto.MemoryReferenceWithCounterTaskStore;
@@ -58,7 +58,7 @@ class TaskEventsSerializationTest {
private static final Instant TIMESTAMP =
Instant.parse("2018-11-13T12:00:55Z");
private static final JsonTaskSerializer TASK_SERIALIZER = new
JsonTaskSerializer(TestTaskDTOModules.COMPLETED_TASK_MODULE,
TestTaskDTOModules.MEMORY_REFERENCE_WITH_COUNTER_TASK_MODULE.apply(new
MemoryReferenceWithCounterTaskStore()));
- private static final JsonTaskAdditionalInformationsSerializer
TASK_ADDITIONNAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationsSerializer(MemoryReferenceWithCounterTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
+ private static final JsonTaskAdditionalInformationSerializer
TASK_ADDITIONNAL_INFORMATION_SERIALIZER = new
JsonTaskAdditionalInformationSerializer(MemoryReferenceWithCounterTaskAdditionalInformationDTO.SERIALIZATION_MODULE);
private static final List<EventDTOModule<?, ?>> MODULES =
TasksSerializationModule.MODULES.apply(TASK_SERIALIZER,
TASK_ADDITIONNAL_INFORMATION_SERIALIZER);
private static final JsonEventSerializer SERIALIZER = new
JsonEventSerializer(MODULES.stream().collect(Guavate.toImmutableSet()));
private static final TaskAggregateId AGGREGATE_ID = new
TaskAggregateId(TaskId.fromString("2c7f4081-aa30-11e9-bf6c-2d3b9e84aafd"));
diff --git
a/server/task/task-json/src/main/java/org/apache/james/server/task/json/JsonTaskAdditionalInformationsSerializer.java
b/server/task/task-json/src/main/java/org/apache/james/server/task/json/JsonTaskAdditionalInformationSerializer.java
similarity index 84%
rename from
server/task/task-json/src/main/java/org/apache/james/server/task/json/JsonTaskAdditionalInformationsSerializer.java
rename to
server/task/task-json/src/main/java/org/apache/james/server/task/json/JsonTaskAdditionalInformationSerializer.java
index 3473fb6..751cc17 100644
---
a/server/task/task-json/src/main/java/org/apache/james/server/task/json/JsonTaskAdditionalInformationsSerializer.java
+++
b/server/task/task-json/src/main/java/org/apache/james/server/task/json/JsonTaskAdditionalInformationSerializer.java
@@ -31,10 +31,10 @@ import org.apache.james.task.TaskExecutionDetails;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.collect.ImmutableSet;
-public class JsonTaskAdditionalInformationsSerializer {
+public class JsonTaskAdditionalInformationSerializer {
- public static class InvalidAdditionalInformationsException extends
RuntimeException {
- public
InvalidAdditionalInformationsException(JsonGenericSerializer.InvalidTypeException
original) {
+ public static class InvalidAdditionalInformationException extends
RuntimeException {
+ public
InvalidAdditionalInformationException(JsonGenericSerializer.InvalidTypeException
original) {
super(original);
}
}
@@ -48,11 +48,11 @@ public class JsonTaskAdditionalInformationsSerializer {
private JsonGenericSerializer<TaskExecutionDetails.AdditionalInformation,
AdditionalInformationDTO> jsonGenericSerializer;
@Inject
- public
JsonTaskAdditionalInformationsSerializer(Set<AdditionalInformationDTOModule<?,
?>> modules) {
+ public
JsonTaskAdditionalInformationSerializer(Set<AdditionalInformationDTOModule<?,
?>> modules) {
jsonGenericSerializer = new JsonGenericSerializer(modules);
}
- public
JsonTaskAdditionalInformationsSerializer(@SuppressWarnings("rawtypes")
AdditionalInformationDTOModule... modules) {
+ public
JsonTaskAdditionalInformationSerializer(@SuppressWarnings("rawtypes")
AdditionalInformationDTOModule... modules) {
this(ImmutableSet.copyOf(modules));
}
@@ -70,7 +70,7 @@ public class JsonTaskAdditionalInformationsSerializer {
} catch (JsonGenericSerializer.UnknownTypeException e) {
throw new UnknownAdditionalInformationException(e);
} catch (JsonGenericSerializer.InvalidTypeException e) {
- throw new InvalidAdditionalInformationsException(e);
+ throw new InvalidAdditionalInformationException(e);
}
}
}
diff --git a/src/homepage/_posts/2006-08-03-2.3.0-RC3.markdown
b/src/homepage/_posts/2006-08-03-2.3.0-RC3.markdown
index e3b57f2..f975bf7 100644
--- a/src/homepage/_posts/2006-08-03-2.3.0-RC3.markdown
+++ b/src/homepage/_posts/2006-08-03-2.3.0-RC3.markdown
@@ -6,7 +6,7 @@ categories: james update
---
James PMC is proud to announce the [availability][availability] of the third,
and hopefully
-last, release candidate of James Server 2.3.0. More informations on what's new
can be found in the [changelog]: /server/2.3.0/changelog.html.
+last, release candidate of James Server 2.3.0. More information on what's new
can be found in the [changelog]: /server/2.3.0/changelog.html.
New development roadmaps are being discussed right now, so stay tuned for
2.3.0 final and for the following news.
diff --git a/src/homepage/_posts/2006-10-03-JAMES-2.3.markdown
b/src/homepage/_posts/2006-10-03-JAMES-2.3.markdown
index a677459..d787c98 100644
--- a/src/homepage/_posts/2006-10-03-JAMES-2.3.markdown
+++ b/src/homepage/_posts/2006-10-03-JAMES-2.3.markdown
@@ -6,7 +6,7 @@ categories: james update
---
James PMC is proud to announce the [availability][availability] of the long
awaited final release of James Server 2.3.0.
-More informations on what's new can be found in the [changelog][changelog] .
+More information on what's new can be found in the [changelog][changelog] .
[availability]: download.cgi
[changelog]: /server/2.3.0/changelog.html
\ No newline at end of file
diff --git a/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md
b/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md
index 21a4a49..dfc4a82 100644
--- a/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md
+++ b/src/site/markdown/server/install/guice-cassandra-rabbitmq-swift.md
@@ -76,7 +76,7 @@ To use Scality S3 server you have to launch it instead of
swift container:
$ docker run -d -p 8080:8000 --name=s3 scality/s3server:6018536a
```
-More informations about available options
[here](https://hub.docker.com/r/scality/s3server).
+More information about available options
[here](https://hub.docker.com/r/scality/s3server).
## Guice-cassandra-rabbitmq-ldap
diff --git a/src/site/markdown/server/manage-webadmin.md
b/src/site/markdown/server/manage-webadmin.md
index 1819ade..28f8b8f 100644
--- a/src/site/markdown/server/manage-webadmin.md
+++ b/src/site/markdown/server/manage-webadmin.md
@@ -1917,7 +1917,7 @@ If the Accept header in the request is
"application/json", then the response loo
```
If the Accept header in the request is "message/rfc822", then the response
will be the _eml_ file itself.
-Additional query parameter `additionalFields` add the existing informations to
the response for the supported values:
+Additional query parameter `additionalFields` add the existing information to
the response for the supported values:
- attributes
- headers
- textBody
diff --git a/src/site/xdoc/documentation.xml b/src/site/xdoc/documentation.xml
index eb902e0..f7ce48b 100644
--- a/src/site/xdoc/documentation.xml
+++ b/src/site/xdoc/documentation.xml
@@ -106,7 +106,7 @@
The jSPF library is pure Java SPF implementation. It was
designed to match the current SPF-Specs of 2006-2009 (See RFC section).
SPF is also knows as Sender Policy Framework. It was designed
to detect email spoofing
This is the solution if you ever was tired of getting spam from
yourself.
- For more informations see <abbr title='Sender Policy
Framework'> <a href='http://www.openspf.org/'>openspf website</a></abbr>.
+ For more information see <abbr title='Sender Policy Framework'>
<a href='http://www.openspf.org/'>openspf website</a></abbr>.
</p>
<p><a href='http://james.apache.org/jsieve'>Apache James
jSieve</a> is a Java implementation of
diff --git a/src/site/xdoc/server/archive/configuration_v2_0.xml
b/src/site/xdoc/server/archive/configuration_v2_0.xml
index 7020fab..4bca0f4 100644
--- a/src/site/xdoc/server/archive/configuration_v2_0.xml
+++ b/src/site/xdoc/server/archive/configuration_v2_0.xml
@@ -182,7 +182,7 @@
<tr>
<td> repository </td>
<td> file://var/users/ </td>
- <td> The path where local mail account informations are stored.
</td>
+ <td> The path where local mail account information are stored.
</td>
</tr>
</table>
</subsection>
diff --git a/src/site/xdoc/server/dev-extend-smtp-hook.xml
b/src/site/xdoc/server/dev-extend-smtp-hook.xml
index e17cbda..9157668 100644
--- a/src/site/xdoc/server/dev-extend-smtp-hook.xml
+++ b/src/site/xdoc/server/dev-extend-smtp-hook.xml
@@ -42,7 +42,7 @@
<subsection name="Things to Remember ">
<p>Be aware that your implementation needs to be thread-safe as it will
get used as singleton.
- If you need to store temporary informations within the SMTP
Transaction/Session you should
+ If you need to store temporary information within the SMTP
Transaction/Session you should
use the <code>SMTPSession.getState().put(...)</code>
and <code>SMTPSession.getConnectionState().put(...)</code>
methods.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
