You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2022/03/01 02:07:51 UTC
[james-project] 01/05: [SONAR] Run inspections for WebAdmin projects
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit c68984de343c994c30e691959f3a2b26a851646b
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Feb 20 13:18:45 2022 +0700
[SONAR] Run inspections for WebAdmin projects
---
.../WebAdminReIndexingTaskSerializationModule.java | 10 +++----
.../webadmin/routes/CassandraMappingsRoutes.java | 3 --
.../webadmin/routes/CassandraMigrationRoutes.java | 2 +-
.../service/CassandraMigrationService.java | 0
...lveMailboxInconsistenciesRequestToTaskTest.java | 3 +-
...lveMessageInconsistenciesRequestToTaskTest.java | 3 +-
.../apache/james/webadmin/routes/AliasRoutes.java | 2 --
.../webadmin/routes/DomainMappingsRoutes.java | 1 -
.../james/webadmin/routes/ForwardRoutes.java | 2 --
.../apache/james/webadmin/routes/GroupsRoutes.java | 4 +--
.../james/webadmin/routes/MailAddressParser.java | 2 +-
.../james/webadmin/routes/MappingRoutes.java | 2 +-
.../james/webadmin/routes/SieveQuotaRoutes.java | 1 -
.../apache/james/webadmin/dto/VacationDTOTest.java | 19 +++++++------
.../james/webadmin/routes/BlobRoutesTest.java | 2 +-
.../routes/DLPConfigurationRoutesTest.java | 8 +++---
.../james/webadmin/routes/VacationRoutesTest.java | 27 +++++++++---------
.../james/webadmin/data/jmap/JmapUploadRoutes.java | 5 ----
.../james/webadmin/data/jmap/RunningOptions.java | 2 +-
.../webadmin/data/jmap/JmapUploadRoutesTest.java | 6 ++--
.../james/routes/TransferEmailRoutesTest.java | 11 ++++----
.../routes/DeletedMessagesVaultExportTask.java | 10 ++++---
.../routes/DeletedMessagesVaultExportTaskDTO.java | 2 +-
.../webadmin/vault/routes/RestoreService.java | 2 +-
...edMessagesVaultExportTaskSerializationTest.java | 2 +-
.../WebAdminReprocessingContextInformationDTO.java | 4 +--
...lboxReindexingTaskAdditionalInformationDTO.java | 3 +-
...UserReindexingTaskAdditionalInformationDTO.java | 3 +-
.../webadmin/routes/EventDeadLettersRoutes.java | 2 --
.../james/webadmin/routes/UserQuotaRoutes.java | 22 ---------------
.../service/PreviousReIndexingService.java | 4 +--
...AdminReprocessingContextInformationDTOTest.java | 8 +++---
.../WebAdminSingleMailboxReprocessingDTOTest.java | 4 +--
.../james/webadmin/routes/MailboxesRoutesTest.java | 6 ++--
.../webadmin/routes/UserMailboxesRoutesTest.java | 4 +--
.../james/webadmin/routes/UserQuotaRoutesTest.java | 10 +++----
...boxContentTaskAdditionalInformationDTOTest.java | 2 +-
.../ClearMailboxContentTaskSerializationTest.java | 2 +-
...ingParentsTaskAdditionalInformationDTOTest.java | 2 +-
.../CreateMissingParentsTaskSerializationTest.java | 2 +-
.../webadmin/validation/QuotaLimitValueTest.java | 4 +--
.../james/webadmin/routes/MailQueueRoutes.java | 8 ++----
.../james/webadmin/routes/MailQueueRoutesTest.java | 32 +++++++++++-----------
.../webadmin/dto/InaccessibleFieldException.java | 1 +
.../webadmin/routes/MailRepositoriesRoutes.java | 3 +-
.../webadmin/service/ClearMailRepositoryTask.java | 2 +-
.../Pop3MetaDataFixInconsistenciesRoutesTest.java | 2 +-
.../webadmin/routes/RabbitMQMailQueuesRoutes.java | 2 --
48 files changed, 108 insertions(+), 155 deletions(-)
diff --git a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java
index ffa3130..537d758 100644
--- a/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java
+++ b/server/container/guice/protocols/webadmin-mailbox/src/main/java/org/apache/james/modules/server/WebAdminReIndexingTaskSerializationModule.java
@@ -38,13 +38,13 @@ public class WebAdminReIndexingTaskSerializationModule extends AbstractModule {
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> errorRecoveryAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return WebAdminReprocessingContextInformationDTO.WebAdminErrorRecoveryIndexationDTO.serializationModule(mailboxIdFactory);
+ return WebAdminReprocessingContextInformationDTO.WebAdminErrorRecoveryIndexationDTO.serializationModule();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
- public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> fullReindexAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return WebAdminReprocessingContextInformationDTO.WebAdminFullIndexationDTO.serializationModule(mailboxIdFactory);
+ public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> fullReindexAdditionalInformation() {
+ return WebAdminReprocessingContextInformationDTO.WebAdminFullIndexationDTO.serializationModule();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@@ -56,7 +56,7 @@ public class WebAdminReIndexingTaskSerializationModule extends AbstractModule {
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> singleMailboxReindexingAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory);
+ return WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.serializationModule();
}
@Named(DTOModuleInjections.WEBADMIN_DTO)
@@ -68,6 +68,6 @@ public class WebAdminReIndexingTaskSerializationModule extends AbstractModule {
@Named(DTOModuleInjections.WEBADMIN_DTO)
@ProvidesIntoSet
public AdditionalInformationDTOModule<? extends TaskExecutionDetails.AdditionalInformation, ? extends AdditionalInformationDTO> userReindexingAdditionalInformation(MailboxId.Factory mailboxIdFactory) {
- return WebAdminUserReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory);
+ return WebAdminUserReindexingTaskAdditionalInformationDTO.serializationModule();
}
}
diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/routes/CassandraMappingsRoutes.java b/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/routes/CassandraMappingsRoutes.java
index e7ff5ac..af04dc2 100644
--- a/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/routes/CassandraMappingsRoutes.java
+++ b/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/routes/CassandraMappingsRoutes.java
@@ -39,9 +39,6 @@ public class CassandraMappingsRoutes implements Routes {
private final TaskManager taskManager;
private final JsonTransformer jsonTransformer;
- private static final String INVALID_ACTION_ARGUMENT_REQUEST = "Invalid action argument for performing operation on mappings data";
- private static final String ACTION_REQUEST_CAN_NOT_BE_DONE = "The action requested for performing operation on mappings data cannot be performed";
-
@Inject
CassandraMappingsRoutes(CassandraMappingsService cassandraMappingsService, TaskManager taskManager, JsonTransformer jsonTransformer) {
this.cassandraMappingsService = cassandraMappingsService;
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMigrationRoutes.java b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMigrationRoutes.java
index 754fda6..d61687f 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMigrationRoutes.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/routes/CassandraMigrationRoutes.java
@@ -46,12 +46,12 @@ public class CassandraMigrationRoutes implements Routes {
private static final String VERSION_BASE_LATEST = VERSION_BASE + "/latest";
private static final String VERSION_UPGRADE_BASE = VERSION_BASE + "/upgrade";
private static final String VERSION_UPGRADE_TO_LATEST_BASE = VERSION_UPGRADE_BASE + "/latest";
+ public static final String MIGRATION_REQUEST_CAN_NOT_BE_DONE = "The migration requested can not be performed";
private final CassandraMigrationService cassandraMigrationService;
private final TaskManager taskManager;
private final JsonTransformer jsonTransformer;
- public static String MIGRATION_REQUEST_CAN_NOT_BE_DONE = "The migration requested can not be performed";
@Inject
public CassandraMigrationRoutes(CassandraMigrationService cassandraMigrationService,
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/service/CassandraMigrationService.java b/server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/service/CassandraMigrationService.java
deleted file mode 100644
index e69de29..0000000
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMailboxInconsistenciesRequestToTaskTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMailboxInconsistenciesRequestToTaskTest.java
index 387ce93..b0a3cc7 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMailboxInconsistenciesRequestToTaskTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMailboxInconsistenciesRequestToTaskTest.java
@@ -46,11 +46,10 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import io.restassured.RestAssured;
-import io.restassured.filter.log.LogDetail;
import reactor.core.publisher.Mono;
import spark.Service;
-public class SolveMailboxInconsistenciesRequestToTaskTest {
+class SolveMailboxInconsistenciesRequestToTaskTest {
private final class JMAPRoutes implements Routes {
private final SolveMailboxInconsistenciesService service;
private final TaskManager taskManager;
diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMessageInconsistenciesRequestToTaskTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMessageInconsistenciesRequestToTaskTest.java
index bd60510..cfc34ee 100644
--- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMessageInconsistenciesRequestToTaskTest.java
+++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/SolveMessageInconsistenciesRequestToTaskTest.java
@@ -47,11 +47,10 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import io.restassured.RestAssured;
-import io.restassured.filter.log.LogDetail;
import reactor.core.publisher.Mono;
import spark.Service;
-public class SolveMessageInconsistenciesRequestToTaskTest {
+class SolveMessageInconsistenciesRequestToTaskTest {
private final class JMAPRoutes implements Routes {
private final SolveMessageInconsistenciesService service;
private final TaskManager taskManager;
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java
index b7ecde5..2daf6f8 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/AliasRoutes.java
@@ -64,8 +64,6 @@ public class AliasRoutes implements Routes {
private static final String ALIAS_SOURCE_ADDRESS = "aliasSourceAddress";
private static final String USER_IN_ALIAS_SOURCES_ADDRESSES_PATH = ALIAS_ADDRESS_PATH + SEPARATOR +
"sources" + SEPARATOR + ":" + ALIAS_SOURCE_ADDRESS;
- private static final String MAILADDRESS_ASCII_DISCLAIMER = "Note that email addresses are restricted to ASCII character set. " +
- "Mail addresses not matching this criteria will be rejected.";
private static final String ADDRESS_TYPE = "alias";
private final DomainList domainList;
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DomainMappingsRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DomainMappingsRoutes.java
index f67d326..0f16944 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DomainMappingsRoutes.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/DomainMappingsRoutes.java
@@ -52,7 +52,6 @@ import spark.Service;
public class DomainMappingsRoutes implements Routes {
public static final String DOMAIN_MAPPINGS = "/domainMappings";
private static final String FROM_DOMAIN = "fromDomain";
- private static final String SPECIFIC_MAPPING_PATH = SEPARATOR + "/{" + FROM_DOMAIN + "}";
private static final String SPECIFIC_MAPPING = DOMAIN_MAPPINGS + SEPARATOR + ":" + FROM_DOMAIN;
private final RecipientRewriteTable recipientRewriteTable;
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
index a206a3f..3df8519 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/ForwardRoutes.java
@@ -63,8 +63,6 @@ public class ForwardRoutes implements Routes {
private static final String FORWARD_DESTINATION_ADDRESS = "forwardDestinationAddress";
private static final String USER_IN_FORWARD_DESTINATION_ADDRESSES_PATH = FORWARD_ADDRESS_PATH + SEPARATOR +
"targets" + SEPARATOR + ":" + FORWARD_DESTINATION_ADDRESS;
- private static final String MAILADDRESS_ASCII_DISCLAIMER = "Note that email addresses are restricted to ASCII character set. " +
- "Mail addresses not matching this criteria will be rejected.";
private static final String FORWARD_BASE_ADDRESS_TYPE = "base forward";
private static final String FORWARD_DESTINATION_ADDRESS_TYPE = "target forward";
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java
index e621c17..b32349e 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/GroupsRoutes.java
@@ -62,8 +62,6 @@ public class GroupsRoutes implements Routes {
private static final String GROUP_ADDRESS_PATH = ROOT_PATH + SEPARATOR + ":" + GROUP_ADDRESS;
private static final String USER_ADDRESS = "userAddress";
private static final String USER_IN_GROUP_ADDRESS_PATH = GROUP_ADDRESS_PATH + SEPARATOR + ":" + USER_ADDRESS;
- private static final String MAILADDRESS_ASCII_DISCLAIMER = "Note that email addresses are restricted to ASCII character set. " +
- "Mail addresses not matching this criteria will be rejected.";
private static final String GROUP_ADDRESS_TYPE = "group";
private static final String USER_ADDRESS_TYPE = "group member";
@@ -96,7 +94,7 @@ public class GroupsRoutes implements Routes {
return recipientRewriteTable.getSourcesForType(Mapping.Type.Group).collect(ImmutableList.toImmutableList());
}
- public HaltException addToGroup(Request request, Response response) throws Exception {
+ public HaltException addToGroup(Request request, Response response) {
MailAddress groupAddress = MailAddressParser.parseMailAddress(request.params(GROUP_ADDRESS), GROUP_ADDRESS_TYPE);
Domain domain = groupAddress.getDomain();
MailAddress userAddress = MailAddressParser.parseMailAddress(request.params(USER_ADDRESS), USER_ADDRESS_TYPE);
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/MailAddressParser.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/MailAddressParser.java
index f138ebd..0f7b03b 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/MailAddressParser.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/MailAddressParser.java
@@ -40,7 +40,7 @@ class MailAddressParser {
String decodedAddress = URLDecoder.decode(address, StandardCharsets.UTF_8.displayName());
return new MailAddress(decodedAddress);
} catch (AddressException e) {
- LOGGER.error("The " + addressType + " " + address + " is not an email address");
+ LOGGER.error("The {} {} is not an email address", addressType, address);
throw ErrorResponder.builder()
.statusCode(HttpStatus.BAD_REQUEST_400)
.type(ErrorResponder.ErrorType.INVALID_ARGUMENT)
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/MappingRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/MappingRoutes.java
index a00a9b1..5df07e8 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/MappingRoutes.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/MappingRoutes.java
@@ -91,7 +91,7 @@ public class MappingRoutes implements Routes {
return recipientRewriteTable.getStoredMappings(MappingSource.fromUser(username))
.asStream()
- .map(mapping -> MappingValueDTO.fromMapping(mapping))
+ .map(MappingValueDTO::fromMapping)
.collect(ImmutableList.toImmutableList());
}
}
diff --git a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java
index 1b6fee1..c72b672 100644
--- a/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java
+++ b/server/protocols/webadmin/webadmin-data/src/main/java/org/apache/james/webadmin/routes/SieveQuotaRoutes.java
@@ -46,7 +46,6 @@ public class SieveQuotaRoutes implements Routes {
public static final String DEFAULT_QUOTA_PATH = ROOT_PATH + SEPARATOR + "default";
private static final String USER_ID = "userId";
private static final String USER_SIEVE_QUOTA_PATH = Joiner.on(SEPARATOR).join(ROOT_PATH, "users", ":" + USER_ID);
- private static final String REQUESTED_SIZE = "requestedSize";
private final SieveQuotaRepository sieveQuotaRepository;
private final UsersRepository usersRepository;
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/dto/VacationDTOTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/dto/VacationDTOTest.java
index 2286b7e..9300c5b 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/dto/VacationDTOTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/dto/VacationDTOTest.java
@@ -19,31 +19,32 @@
package org.apache.james.webadmin.dto;
-import nl.jqno.equalsverifier.EqualsVerifier;
-import org.apache.james.vacation.api.Vacation;
-import org.assertj.core.api.SoftAssertions;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.time.ZonedDateTime;
import java.util.Optional;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import org.apache.james.vacation.api.Vacation;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
-public class VacationDTOTest {
+class VacationDTOTest {
@Test
- public void shouldMatchBeanContract() {
+ void shouldMatchBeanContract() {
EqualsVerifier.forClass(VacationDTO.class).verify();
}
@Test
- public void fromShouldThrowOnNull() {
+ void fromShouldThrowOnNull() {
assertThatThrownBy(() -> VacationDTO.from(null))
.isInstanceOf(NullPointerException.class);
}
@Test
- public void fromShouldSetAllFields() {
+ void fromShouldSetAllFields() {
Vacation vacation = Vacation.builder()
.enabled(false)
.fromDate(Optional.of(ZonedDateTime.parse("2021-09-13T10:00:00Z")))
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/BlobRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/BlobRoutesTest.java
index 84c22f4..f04bbae 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/BlobRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/BlobRoutesTest.java
@@ -74,7 +74,7 @@ import io.restassured.RestAssured;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
-public class BlobRoutesTest {
+class BlobRoutesTest {
private static final String BASE_PATH = "/blobs";
private static final HashBlobId.Factory BLOB_ID_FACTORY = new HashBlobId.Factory();
private static final ZonedDateTime TIMESTAMP = ZonedDateTime.parse("2015-10-30T16:12:00Z");
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
index 7b3f8a9..c6e19fe 100644
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java
@@ -866,7 +866,7 @@ class DLPConfigurationRoutesTest {
@Nested
class DefineFetch {
@Test
- public void fetchShouldBeOK() throws Exception {
+ void fetchShouldBeOK() {
storeRules();
String jsonAsString =
@@ -893,7 +893,7 @@ class DLPConfigurationRoutesTest {
}
@Test
- public void fetchOnUnknownDomainShouldBe404() throws Exception {
+ void fetchOnUnknownDomainShouldBe404() {
storeRules();
when()
@@ -907,7 +907,7 @@ class DLPConfigurationRoutesTest {
}
@Test
- public void fetchOnUnknownDomainAndRuleShouldBe404() throws Exception {
+ void fetchOnUnknownDomainAndRuleShouldBe404() {
when()
.get("strange.com/rules/666")
.then()
@@ -919,7 +919,7 @@ class DLPConfigurationRoutesTest {
}
@Test
- public void fetchOnUnknownRuleIdShouldBe404() throws Exception {
+ void fetchOnUnknownRuleIdShouldBe404() {
storeRules();
when()
diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/VacationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/VacationRoutesTest.java
index 954e87c..6aa9476 100755
--- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/VacationRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/VacationRoutesTest.java
@@ -19,8 +19,17 @@
package org.apache.james.webadmin.routes;
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
+import static io.restassured.RestAssured.given;
+import static io.restassured.RestAssured.when;
+import static org.apache.james.webadmin.Constants.SEPARATOR;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Optional;
+
import org.apache.james.DefaultVacationService;
import org.apache.james.core.Domain;
import org.apache.james.core.MailAddress;
@@ -45,18 +54,10 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Optional;
-
-import static io.restassured.RestAssured.given;
-import static io.restassured.RestAssured.when;
-import static org.apache.james.webadmin.Constants.SEPARATOR;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
-public class VacationRoutesTest {
+class VacationRoutesTest {
private static final String BOB = "bob@example.org";
private static final String ALICE = "alice@example.org";
diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutes.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutes.java
index 9d9ec5a..b9502d9 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutes.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutes.java
@@ -30,8 +30,6 @@ import org.apache.james.webadmin.Routes;
import org.apache.james.webadmin.data.jmap.UploadRepositoryCleanupTask.CleanupScope;
import org.apache.james.webadmin.tasks.TaskFromRequest;
import org.apache.james.webadmin.utils.JsonTransformer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
@@ -39,9 +37,6 @@ import spark.Request;
import spark.Service;
public class JmapUploadRoutes implements Routes {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(JmapUploadRoutes.class);
-
public static final String BASE_PATH = "/jmap/uploads";
private final CassandraUploadRepository uploadRepository;
diff --git a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptions.java b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptions.java
index 0ca7078..3bf5eb7 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptions.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/main/java/org/apache/james/webadmin/data/jmap/RunningOptions.java
@@ -26,7 +26,7 @@ public class RunningOptions {
return new RunningOptions(messageRatePerSecond);
}
- public static RunningOptions DEFAULT = new RunningOptions(10);
+ public static final RunningOptions DEFAULT = new RunningOptions(10);
private final int messagesPerSecond;
diff --git a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutesTest.java b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutesTest.java
index 9956c16..bc08f10 100644
--- a/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-jmap/src/test/java/org/apache/james/webadmin/data/jmap/JmapUploadRoutesTest.java
@@ -73,7 +73,7 @@ import io.restassured.RestAssured;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
-public class JmapUploadRoutesTest {
+class JmapUploadRoutesTest {
private static final String BASE_PATH = "/jmap/uploads";
private static final ContentType CONTENT_TYPE = ContentType.of("text/html");
@@ -272,9 +272,7 @@ public class JmapUploadRoutesTest {
List<BucketName> bucketNameList = Flux.from(blobStore.listBuckets()).collectList().block();
assertThat(bucketNameList)
- .contains(unExpiredBucketName1, unExpiredBucketName2);
-
- assertThat(bucketNameList)
+ .contains(unExpiredBucketName1, unExpiredBucketName2)
.doesNotContain(expiredBucketName1, expiredBucketName2);
}
diff --git a/server/protocols/webadmin/webadmin-mail-over-web/src/test/java/org/apache/james/routes/TransferEmailRoutesTest.java b/server/protocols/webadmin/webadmin-mail-over-web/src/test/java/org/apache/james/routes/TransferEmailRoutesTest.java
index ea71371..d875056 100644
--- a/server/protocols/webadmin/webadmin-mail-over-web/src/test/java/org/apache/james/routes/TransferEmailRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mail-over-web/src/test/java/org/apache/james/routes/TransferEmailRoutesTest.java
@@ -26,13 +26,11 @@ import static io.restassured.config.RestAssuredConfig.newConfig;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalUnit;
import org.apache.james.queue.api.MailQueue;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.RawMailQueueItemDecoratorFactory;
import org.apache.james.queue.memory.MemoryMailQueueFactory;
-import org.apache.james.server.core.MailImpl;
import org.apache.james.util.ClassLoaderUtils;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
@@ -45,13 +43,14 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import com.github.fge.lambdas.Throwing;
+
import io.restassured.RestAssured;
import io.restassured.builder.RequestSpecBuilder;
import io.restassured.http.ContentType;
import io.restassured.specification.RequestSpecification;
import reactor.core.publisher.Flux;
-public class TransferEmailRoutesTest {
+class TransferEmailRoutesTest {
private WebAdminServer webAdminServer;
@@ -88,7 +87,7 @@ public class TransferEmailRoutesTest {
@Test
- public void whenToIsMissingInRequestThenRequestFails() {
+ void whenToIsMissingInRequestThenRequestFails() {
given()
.body(ClassLoaderUtils.getSystemResourceAsString("message/rfc822/message-without-tos.eml"))
.when()
@@ -104,7 +103,7 @@ public class TransferEmailRoutesTest {
}
@Test
- public void statusCode201ReturnedWhenSendingMailWithAllRequiredFields() {
+ void statusCode201ReturnedWhenSendingMailWithAllRequiredFields() {
given()
.body(ClassLoaderUtils.getSystemResourceAsString("message/rfc822/message.eml"))
.when()
@@ -124,7 +123,7 @@ public class TransferEmailRoutesTest {
}
@Test
- public void requestFailsOnEmptyBody() {
+ void requestFailsOnEmptyBody() {
given()
.body("")
.when()
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
index 363f825..475a4a6 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java
@@ -34,8 +34,6 @@ import org.apache.james.vault.search.Query;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.annotations.VisibleForTesting;
-
public class DeletedMessagesVaultExportTask implements Task {
static final TaskType TYPE = TaskType.of("deleted-messages-export");
@@ -76,8 +74,7 @@ public class DeletedMessagesVaultExportTask implements Task {
private final ExportService exportService;
private final Username userExportFrom;
- @VisibleForTesting
- final Query exportQuery;
+ private final Query exportQuery;
private final MailAddress exportTo;
private final AtomicLong totalExportedMessages;
@@ -89,6 +86,11 @@ public class DeletedMessagesVaultExportTask implements Task {
this.totalExportedMessages = new AtomicLong();
}
+
+ public Query getExportQuery() {
+ return exportQuery;
+ }
+
@Override
public Result run() {
try {
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskDTO.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskDTO.java
index df42864..e335969 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultExportTaskDTO.java
@@ -71,7 +71,7 @@ public class DeletedMessagesVaultExportTaskDTO implements TaskDTO {
}
DeletedMessagesVaultExportTaskDTO createDTO(DeletedMessagesVaultExportTask task, String type) {
- return new DeletedMessagesVaultExportTaskDTO(type, task.getUserExportFrom().asString(), queryTranslator.toDTO(task.exportQuery), task.getExportTo().asString());
+ return new DeletedMessagesVaultExportTaskDTO(type, task.getUserExportFrom().asString(), queryTranslator.toDTO(task.getExportQuery()), task.getExportTo().asString());
}
}
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java
index ead4dde..8ade54e 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/RestoreService.java
@@ -60,7 +60,7 @@ class RestoreService {
private static final Logger LOGGER = LoggerFactory.getLogger(RestoreService.class);
private static final Predicate<Throwable> CONTENT_NOT_FOUND_PREDICATE =
- throwable -> throwable instanceof DeletedMessageContentNotFoundException;
+ DeletedMessageContentNotFoundException.class::isInstance;
private final DeletedMessageVault deletedMessageVault;
private final MailboxManager mailboxManager;
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 9f20209..f1b9eed 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
@@ -69,7 +69,7 @@ class DeletedMessagesVaultExportTaskSerializationTest {
factory = new DeletedMessagesVaultExportTaskDTO.Factory(exportService, queryTranslator);
equalityTester = (a, b) -> {
assertThat(a).isEqualToComparingOnlyGivenFields(b, "userExportFrom", "exportTo");
- assertThat(queryTranslator.toDTO(a.exportQuery)).isEqualTo(queryTranslator.toDTO(b.exportQuery));
+ assertThat(queryTranslator.toDTO(a.getExportQuery())).isEqualTo(queryTranslator.toDTO(b.getExportQuery()));
};
}
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTO.java
index ceb2b19..35aa0b2 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTO.java
@@ -36,7 +36,7 @@ import com.google.common.collect.ImmutableList;
public class WebAdminReprocessingContextInformationDTO implements AdditionalInformationDTO {
public static class WebAdminErrorRecoveryIndexationDTO extends WebAdminReprocessingContextInformationDTO {
- public static AdditionalInformationDTOModule<ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask, WebAdminErrorRecoveryIndexationDTO> serializationModule(MailboxId.Factory mailboxIdFactory) {
+ public static AdditionalInformationDTOModule<ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask, WebAdminErrorRecoveryIndexationDTO> serializationModule() {
return DTOModule.forDomainObject(ReprocessingContextInformationDTO.ReprocessingContextInformationForErrorRecoveryIndexationTask.class)
.convertToDTO(WebAdminErrorRecoveryIndexationDTO.class)
.toDomainObjectConverter(dto -> {
@@ -60,7 +60,7 @@ public class WebAdminReprocessingContextInformationDTO implements AdditionalInfo
}
public static class WebAdminFullIndexationDTO extends WebAdminReprocessingContextInformationDTO {
- public static AdditionalInformationDTOModule<ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask, WebAdminFullIndexationDTO> serializationModule(MailboxId.Factory mailboxIdFactory) {
+ public static AdditionalInformationDTOModule<ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask, WebAdminFullIndexationDTO> serializationModule() {
return DTOModule.forDomainObject(ReprocessingContextInformationDTO.ReprocessingContextInformationForFullReindexingTask.class)
.convertToDTO(WebAdminFullIndexationDTO.class)
.toDomainObjectConverter(dto -> {
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java
index d6348e1..49c2692 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.json.DTOModule;
import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures;
-import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.server.task.json.dto.AdditionalInformationDTO;
import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
import org.apache.mailbox.tools.indexer.RunningOptionsDTO;
@@ -34,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
public class WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static AdditionalInformationDTOModule<SingleMailboxReindexingTask.AdditionalInformation, WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO> serializationModule(MailboxId.Factory factory) {
+ public static AdditionalInformationDTOModule<SingleMailboxReindexingTask.AdditionalInformation, WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO> serializationModule() {
return DTOModule.forDomainObject(SingleMailboxReindexingTask.AdditionalInformation.class)
.convertToDTO(WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> {
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java
index ff555b1..e1c6f62 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/dto/WebAdminUserReindexingTaskAdditionalInformationDTO.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.james.json.DTOModule;
import org.apache.james.mailbox.indexer.ReIndexingExecutionFailures;
-import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.server.task.json.dto.AdditionalInformationDTO;
import org.apache.james.server.task.json.dto.AdditionalInformationDTOModule;
import org.apache.mailbox.tools.indexer.RunningOptionsDTO;
@@ -34,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
public class WebAdminUserReindexingTaskAdditionalInformationDTO implements AdditionalInformationDTO {
- public static AdditionalInformationDTOModule<UserReindexingTask.AdditionalInformation, WebAdminUserReindexingTaskAdditionalInformationDTO> serializationModule(MailboxId.Factory factory) {
+ public static AdditionalInformationDTOModule<UserReindexingTask.AdditionalInformation, WebAdminUserReindexingTaskAdditionalInformationDTO> serializationModule() {
return DTOModule.forDomainObject(UserReindexingTask.AdditionalInformation.class)
.convertToDTO(WebAdminUserReindexingTaskAdditionalInformationDTO.class)
.toDomainObjectConverter(dto -> {
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/EventDeadLettersRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/EventDeadLettersRoutes.java
index 3eea47f..c5d88e2 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/EventDeadLettersRoutes.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/EventDeadLettersRoutes.java
@@ -43,8 +43,6 @@ public class EventDeadLettersRoutes implements Routes {
public static final String BASE_PATH = "/events/deadLetter";
private static final String GROUP_PARAM = ":group";
private static final String INSERTION_ID_PARAMETER = ":insertionId";
-
- private static final String INTERNAL_SERVER_ERROR = "Internal server error - Something went bad on the server side.";
private static final TaskRegistrationKey RE_DELIVER = TaskRegistrationKey.of("reDeliver");
private final EventDeadLettersService eventDeadLettersService;
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java
index 37ab126..be0511e 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/UserQuotaRoutes.java
@@ -53,7 +53,6 @@ import org.apache.james.webadmin.tasks.TaskFromRequestRegistry;
import org.apache.james.webadmin.tasks.TaskRegistrationKey;
import org.apache.james.webadmin.utils.ErrorResponder;
import org.apache.james.webadmin.utils.ErrorResponder.ErrorType;
-import org.apache.james.webadmin.utils.JsonExtractException;
import org.apache.james.webadmin.utils.JsonExtractor;
import org.apache.james.webadmin.utils.JsonTransformer;
import org.apache.james.webadmin.utils.JsonTransformerModule;
@@ -296,25 +295,4 @@ public class UserQuotaRoutes implements Routes {
}
return username;
}
-
- private QuotaDTO parseQuotaDTO(Request request) {
- try {
- return jsonExtractor.parse(request.body());
- } catch (IllegalArgumentException e) {
- throw ErrorResponder.builder()
- .statusCode(HttpStatus.BAD_REQUEST_400)
- .type(ErrorType.INVALID_ARGUMENT)
- .message("Quota should be positive or unlimited (-1)")
- .cause(e)
- .haltError();
- } catch (JsonExtractException e) {
- throw ErrorResponder.builder()
- .statusCode(HttpStatus.BAD_REQUEST_400)
- .type(ErrorType.INVALID_ARGUMENT)
- .message("Malformed JSON input")
- .cause(e)
- .haltError();
- }
- }
-
}
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/PreviousReIndexingService.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/PreviousReIndexingService.java
index e03f6cd..f9a63b5 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/PreviousReIndexingService.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/PreviousReIndexingService.java
@@ -54,8 +54,8 @@ public class PreviousReIndexingService {
throw new TaskNotYetFinishedException(executionDetails.getStatus());
}
return executionDetails.getAdditionalInformation()
- .filter(additionalInformation -> additionalInformation instanceof IndexingDetailInformation)
- .map(additionalInformation -> (IndexingDetailInformation) additionalInformation)
+ .filter(IndexingDetailInformation.class::isInstance)
+ .map(IndexingDetailInformation.class::cast)
.orElseThrow(() -> new NotAnIndexingRetriableTask(executionDetails.getType()));
}
}
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTOTest.java
index 6bcfa5f..3f45a2d 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTOTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminReprocessingContextInformationDTOTest.java
@@ -78,7 +78,7 @@ class WebAdminReprocessingContextInformationDTOTest {
String json =
JsonGenericSerializer.forModules(WebAdminReprocessingContextInformationDTO.WebAdminErrorRecoveryIndexationDTO
- .serializationModule(new TestId.Factory()))
+ .serializationModule())
.withoutNestedType()
.serialize(domainObject);
@@ -89,7 +89,7 @@ class WebAdminReprocessingContextInformationDTOTest {
@Test
void deserializeErrorRecoveryShouldNotBeSupported() {
assertThatThrownBy(() -> JsonGenericSerializer.forModules(WebAdminReprocessingContextInformationDTO.WebAdminErrorRecoveryIndexationDTO
- .serializationModule(new TestId.Factory()))
+ .serializationModule())
.withoutNestedType()
.deserialize(serializedErrorRecoveryAdditionalInformation))
.isInstanceOf(InvalidDefinitionException.class);
@@ -107,7 +107,7 @@ class WebAdminReprocessingContextInformationDTOTest {
String json =
JsonGenericSerializer.forModules(WebAdminReprocessingContextInformationDTO.WebAdminFullIndexationDTO
- .serializationModule(new TestId.Factory()))
+ .serializationModule())
.withoutNestedType()
.serialize(domainObject);
@@ -118,7 +118,7 @@ class WebAdminReprocessingContextInformationDTOTest {
@Test
void deserializeFullShouldNotBeSupported() {
assertThatThrownBy(() -> JsonGenericSerializer.forModules(WebAdminReprocessingContextInformationDTO.WebAdminFullIndexationDTO
- .serializationModule(new TestId.Factory()))
+ .serializationModule())
.withoutNestedType()
.deserialize(serializedFullAdditionalInformation))
.isInstanceOf(InvalidDefinitionException.class);
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java
index c112ea5..03459e5 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminSingleMailboxReprocessingDTOTest.java
@@ -72,7 +72,7 @@ class WebAdminSingleMailboxReprocessingDTOTest {
String json =
JsonGenericSerializer.forModules(WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO
- .serializationModule(new TestId.Factory()))
+ .serializationModule())
.withoutNestedType()
.serialize(domainObject);
@@ -83,7 +83,7 @@ class WebAdminSingleMailboxReprocessingDTOTest {
@Test
void deserializeShouldNotBeSupported() {
assertThatThrownBy(() -> JsonGenericSerializer.forModules(WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO
- .serializationModule(new TestId.Factory()))
+ .serializationModule())
.withoutNestedType()
.deserialize(serializedAdditionalInformation))
.isInstanceOf(InvalidDefinitionException.class);
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
index f6bfbe2..935d075 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/MailboxesRoutesTest.java
@@ -174,9 +174,9 @@ class MailboxesRoutesTest {
webAdminServer = WebAdminUtils.createWebAdminServer(
new TasksRoutes(taskManager, jsonTransformer,
DTOConverter.of(
- WebAdminErrorRecoveryIndexationDTO.serializationModule(mailboxIdFactory),
- WebAdminFullIndexationDTO.serializationModule(mailboxIdFactory),
- WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory),
+ WebAdminErrorRecoveryIndexationDTO.serializationModule(),
+ WebAdminFullIndexationDTO.serializationModule(),
+ WebAdminSingleMailboxReindexingTaskAdditionalInformationDTO.serializationModule(),
SingleMessageReindexingTaskAdditionalInformationDTO.module(mailboxIdFactory))),
new MailboxesRoutes(taskManager,
jsonTransformer,
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
index 53fcf6e..fe79047 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java
@@ -173,7 +173,7 @@ class UserMailboxesRoutesTest {
taskManager,
ImmutableSet.of(new UserMailboxesRoutes.UserReIndexingTaskRegistration(reIndexer))),
new TasksRoutes(taskManager, new JsonTransformer(),
- DTOConverter.of(WebAdminUserReindexingTaskAdditionalInformationDTO.serializationModule(mailboxIdFactory),
+ DTOConverter.of(WebAdminUserReindexingTaskAdditionalInformationDTO.serializationModule(),
ClearMailboxContentTaskAdditionalInformationDTO.SERIALIZATION_MODULE)))
.start();
@@ -1961,7 +1961,7 @@ class UserMailboxesRoutesTest {
.get(taskId + "/await");
assertThat(mailboxManager.getMailbox(mailboxPath, systemSession).getMailboxCounters(systemSession).getCount())
- .isEqualTo(0);
+ .isZero();
}
@Test
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java
index 699d285..3fd36ef 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java
@@ -847,7 +847,7 @@ class UserQuotaRoutesTest {
}
@Test
- public void getQuotaShouldReturnBothWhenValueSpecified(WebAdminQuotaSearchTestSystem testSystem) throws Exception {
+ void getQuotaShouldReturnBothWhenValueSpecified(WebAdminQuotaSearchTestSystem testSystem) throws Exception {
MaxQuotaManager maxQuotaManager = testSystem.getQuotaSearchTestSystem().getMaxQuotaManager();
UserQuotaRootResolver userQuotaRootResolver = testSystem.getQuotaSearchTestSystem().getQuotaRootResolver();
@@ -880,7 +880,7 @@ class UserQuotaRoutesTest {
}
@Test
- public void getQuotaShouldReturnOccupation(WebAdminQuotaSearchTestSystem testSystem) throws Exception {
+ void getQuotaShouldReturnOccupation(WebAdminQuotaSearchTestSystem testSystem) throws Exception {
MaxQuotaManager maxQuotaManager = testSystem.getQuotaSearchTestSystem().getMaxQuotaManager();
UserQuotaRootResolver userQuotaRootResolver = testSystem.getQuotaSearchTestSystem().getQuotaRootResolver();
InMemoryCurrentQuotaManager currentQuotaManager = testSystem.getQuotaSearchTestSystem().getCurrentQuotaManager();
@@ -909,7 +909,7 @@ class UserQuotaRoutesTest {
}
@Test
- public void getQuotaShouldReturnOccupationWhenUnlimited(WebAdminQuotaSearchTestSystem testSystem) throws Exception {
+ void getQuotaShouldReturnOccupationWhenUnlimited(WebAdminQuotaSearchTestSystem testSystem) throws Exception {
MaxQuotaManager maxQuotaManager = testSystem.getQuotaSearchTestSystem().getMaxQuotaManager();
UserQuotaRootResolver userQuotaRootResolver = testSystem.getQuotaSearchTestSystem().getQuotaRootResolver();
InMemoryCurrentQuotaManager currentQuotaManager = testSystem.getQuotaSearchTestSystem().getCurrentQuotaManager();
@@ -938,7 +938,7 @@ class UserQuotaRoutesTest {
}
@Test
- public void getQuotaShouldReturnOnlySpecifiedValues(WebAdminQuotaSearchTestSystem testSystem) throws Exception {
+ void getQuotaShouldReturnOnlySpecifiedValues(WebAdminQuotaSearchTestSystem testSystem) throws Exception {
MaxQuotaManager maxQuotaManager = testSystem.getQuotaSearchTestSystem().getMaxQuotaManager();
UserQuotaRootResolver userQuotaRootResolver = testSystem.getQuotaSearchTestSystem().getQuotaRootResolver();
@@ -968,7 +968,7 @@ class UserQuotaRoutesTest {
}
@Test
- public void getQuotaShouldReturnGlobalValuesWhenNoUserValuesDefined(WebAdminQuotaSearchTestSystem testSystem) throws Exception {
+ void getQuotaShouldReturnGlobalValuesWhenNoUserValuesDefined(WebAdminQuotaSearchTestSystem testSystem) throws Exception {
MaxQuotaManager maxQuotaManager = testSystem.getQuotaSearchTestSystem().getMaxQuotaManager();
maxQuotaManager.setGlobalMaxStorage(QuotaSizeLimit.size(1111));
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ClearMailboxContentTaskAdditionalInformationDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ClearMailboxContentTaskAdditionalInformationDTOTest.java
index 2647628..ab94786 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ClearMailboxContentTaskAdditionalInformationDTOTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ClearMailboxContentTaskAdditionalInformationDTOTest.java
@@ -27,7 +27,7 @@ import org.apache.james.util.ClassLoaderUtils;
import org.apache.james.webadmin.validation.MailboxName;
import org.junit.jupiter.api.Test;
-public class ClearMailboxContentTaskAdditionalInformationDTOTest {
+class ClearMailboxContentTaskAdditionalInformationDTOTest {
private static final Instant INSTANT = Instant.parse("2007-12-03T10:15:30.00Z");
private static final ClearMailboxContentTask.AdditionalInformation DOMAIN_OBJECT = new ClearMailboxContentTask.AdditionalInformation(
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ClearMailboxContentTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ClearMailboxContentTaskSerializationTest.java
index ca7cdb1..21eb433 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ClearMailboxContentTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ClearMailboxContentTaskSerializationTest.java
@@ -28,7 +28,7 @@ import org.apache.james.webadmin.validation.MailboxName;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class ClearMailboxContentTaskSerializationTest {
+class ClearMailboxContentTaskSerializationTest {
private UserMailboxesService userMailboxesService;
private static final Username USERNAME = Username.of("bob@domain.tld");
private static final MailboxName MAILBOX_NAME = new MailboxName("mbn1");
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/CreateMissingParentsTaskAdditionalInformationDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/CreateMissingParentsTaskAdditionalInformationDTOTest.java
index 26c230c..f100957 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/CreateMissingParentsTaskAdditionalInformationDTOTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/CreateMissingParentsTaskAdditionalInformationDTOTest.java
@@ -27,7 +27,7 @@ import org.apache.james.util.ClassLoaderUtils;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.com.google.common.collect.ImmutableSet;
-public class CreateMissingParentsTaskAdditionalInformationDTOTest {
+class CreateMissingParentsTaskAdditionalInformationDTOTest {
private static final Instant INSTANT = Instant.parse("2007-12-03T10:15:30.00Z");
private static final CreateMissingParentsTask.AdditionalInformation DOMAIN_OBJECT = new CreateMissingParentsTask.AdditionalInformation(
INSTANT, ImmutableSet.of(TestId.of(1).serialize()), 1L, ImmutableSet.of(), 0L);
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/CreateMissingParentsTaskSerializationTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/CreateMissingParentsTaskSerializationTest.java
index 75b890e..1d8ebc8 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/CreateMissingParentsTaskSerializationTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/CreateMissingParentsTaskSerializationTest.java
@@ -28,7 +28,7 @@ import org.apache.james.util.ClassLoaderUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class CreateMissingParentsTaskSerializationTest {
+class CreateMissingParentsTaskSerializationTest {
MailboxManager mailboxManager;
@BeforeEach
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/validation/QuotaLimitValueTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/validation/QuotaLimitValueTest.java
index 4535f39..6bf590e 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/validation/QuotaLimitValueTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/validation/QuotaLimitValueTest.java
@@ -39,7 +39,7 @@ class QuotaLimitValueTest {
@Test
void quotaCountShouldParseZero() {
assertThat(Quotas.quotaCount("0").asLong())
- .isEqualTo(0);
+ .isZero();
}
@Test
@@ -68,7 +68,7 @@ class QuotaLimitValueTest {
@Test
void quotaSizeShouldParseZero() {
assertThat(Quotas.quotaSize("0").asLong())
- .isEqualTo(0);
+ .isZero();
}
@Test
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
index d171dc3..45435e2 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/main/java/org/apache/james/webadmin/routes/MailQueueRoutes.java
@@ -69,12 +69,10 @@ import spark.Service;
public class MailQueueRoutes implements Routes {
public static final String BASE_URL = "/mailQueues";
- @VisibleForTesting static final String MAIL_QUEUE_NAME = ":mailQueueName";
- @VisibleForTesting static final String MAILS = "/mails";
+ static final String MAIL_QUEUE_NAME = ":mailQueueName";
+ static final String MAILS = "/mails";
private static final String DELAYED_QUERY_PARAM = "delayed";
- private static final String LIMIT_QUERY_PARAM = "limit";
- @VisibleForTesting static final int DEFAULT_LIMIT_VALUE = 100;
private static final String SENDER_QUERY_PARAM = "sender";
private static final String NAME_QUERY_PARAM = "name";
private static final String RECIPIENT_QUERY_PARAM = "recipient";
@@ -253,7 +251,7 @@ public class MailQueueRoutes implements Routes {
jsonTransformer);
}
- private String forceDelayedMailsDelivery(Request request, Response response) throws JsonExtractException, MailQueueException {
+ private String forceDelayedMailsDelivery(Request request, Response response) throws MailQueueException {
assertDelayedParamIsTrue(request);
assertPayloadContainsDelayedEntry(request);
try (ManageableMailQueue mailQueue = assertMailQueueExists(request)) {
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index 26047a8..559b56d 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -240,7 +240,7 @@ class MailQueueRoutesTest {
}
@Test
- public void listMailsShouldReturnMailsWhenSome() throws Exception {
+ void listMailsShouldReturnMailsWhenSome() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
queue.enQueue(Mails.defaultMail().name("name").build());
queue.enQueue(Mails.defaultMail().name("name").build());
@@ -254,7 +254,7 @@ class MailQueueRoutesTest {
}
@Test
- public void listMailsShouldReturnMailDetailsWhenSome() throws Exception {
+ void listMailsShouldReturnMailDetailsWhenSome() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
FakeMail mail = Mails.defaultMail().name("name").build();
queue.enQueue(mail);
@@ -276,7 +276,7 @@ class MailQueueRoutesTest {
}
@Test
- public void listMailsShouldReturnEmptyWhenNoDelayedMailsAndAskFor() throws Exception {
+ void listMailsShouldReturnEmptyWhenNoDelayedMailsAndAskFor() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
FakeMail mail = Mails.defaultMail().name("name").build();
queue.enQueue(mail);
@@ -292,7 +292,7 @@ class MailQueueRoutesTest {
}
@Test
- public void listMailsShouldReturnCurrentMailsWhenMailsAndAskForNotDelayed() throws Exception {
+ void listMailsShouldReturnCurrentMailsWhenMailsAndAskForNotDelayed() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
FakeMail mail = Mails.defaultMail().name("name").build();
queue.enQueue(mail);
@@ -308,7 +308,7 @@ class MailQueueRoutesTest {
}
@Test
- public void listMailsShouldReturnDelayedMailsWhenAskFor() throws Exception {
+ void listMailsShouldReturnDelayedMailsWhenAskFor() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
FakeMail mail = Mails.defaultMail().name("name").build();
queue.enQueue(mail, 10, TimeUnit.MINUTES);
@@ -324,7 +324,7 @@ class MailQueueRoutesTest {
}
@Test
- public void listMailsShouldReturnOneMailWhenMailsAndAskForALimitOfOne() throws Exception {
+ void listMailsShouldReturnOneMailWhenMailsAndAskForALimitOfOne() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
FakeMail mail = Mails.defaultMail().name("name").build();
queue.enQueue(mail);
@@ -347,7 +347,7 @@ class MailQueueRoutesTest {
class GetMailQueue {
@Test
- public void getMailQueueShouldReturnTheMailQueueDataWhenMailQueueExists() throws Exception {
+ void getMailQueueShouldReturnTheMailQueueDataWhenMailQueueExists() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
queue.enQueue(Mails.defaultMail().name("name").build());
@@ -520,7 +520,7 @@ class MailQueueRoutesTest {
@Nested
class SideEffects {
@Test
- public void forcingDelayedMailsDeliveryShouldActuallyChangePropertyOnMails() throws Exception {
+ void forcingDelayedMailsDeliveryShouldActuallyChangePropertyOnMails() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
FakeMail mail = Mails.defaultMail().name("name").build();
queue.enQueue(mail, 10L, TimeUnit.MINUTES);
@@ -667,7 +667,7 @@ class MailQueueRoutesTest {
}
@Test
- public void deleteMailsTasksShouldHaveDetailsWhenSenderIsGiven() throws Exception {
+ void deleteMailsTasksShouldHaveDetailsWhenSenderIsGiven() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
queue.enQueue(FakeMail.builder()
@@ -706,7 +706,7 @@ class MailQueueRoutesTest {
}
@Test
- public void deleteMailsTasksShouldHaveDetailsWhenNameIsGiven() throws Exception {
+ void deleteMailsTasksShouldHaveDetailsWhenNameIsGiven() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
queue.enQueue(FakeMail.builder()
@@ -743,7 +743,7 @@ class MailQueueRoutesTest {
}
@Test
- public void deleteMailsTasksShouldHaveDetailsWhenRecipientIsGiven() throws Exception {
+ void deleteMailsTasksShouldHaveDetailsWhenRecipientIsGiven() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
queue.enQueue(FakeMail.builder()
@@ -792,7 +792,7 @@ class MailQueueRoutesTest {
class SideEffects {
@Test
- public void deleteMailsShouldDeleteMailsWhenSenderIsGiven() throws Exception {
+ void deleteMailsShouldDeleteMailsWhenSenderIsGiven() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
queue.enQueue(FakeMail.builder()
@@ -828,7 +828,7 @@ class MailQueueRoutesTest {
}
@Test
- public void deleteMailsShouldDeleteMailsWhenNameIsGiven() throws Exception {
+ void deleteMailsShouldDeleteMailsWhenNameIsGiven() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
queue.enQueue(FakeMail.builder()
@@ -862,7 +862,7 @@ class MailQueueRoutesTest {
}
@Test
- public void deleteMailsShouldDeleteMailsWhenRecipientIsGiven() throws Exception {
+ void deleteMailsShouldDeleteMailsWhenRecipientIsGiven() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
queue.enQueue(FakeMail.builder()
@@ -905,7 +905,7 @@ class MailQueueRoutesTest {
}
@Test
- public void deleteMailsShouldDeleteMailsWhenTheyAreMatching() throws Exception {
+ void deleteMailsShouldDeleteMailsWhenTheyAreMatching() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
String recipient = "recipient@james.org";
queue.enQueue(Mails.defaultMail()
@@ -970,7 +970,7 @@ class MailQueueRoutesTest {
}
@Test
- public void clearMailQueueShouldHaveDetailsWhenNoQueryParameters() throws Exception {
+ void clearMailQueueShouldHaveDetailsWhenNoQueryParameters() throws Exception {
MemoryMailQueueFactory.MemoryCacheableMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
queue.enQueue(FakeMail.builder()
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/dto/InaccessibleFieldException.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/dto/InaccessibleFieldException.java
index d57666b..cedb419 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/dto/InaccessibleFieldException.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/dto/InaccessibleFieldException.java
@@ -36,6 +36,7 @@ public class InaccessibleFieldException extends Exception {
return field;
}
+ @Override
public Exception getCause() {
return cause;
}
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java
index 7c79ad0..aea7771 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/routes/MailRepositoriesRoutes.java
@@ -74,7 +74,6 @@ public class MailRepositoriesRoutes implements Routes {
public static final String MAIL_REPOSITORIES = "mailRepositories";
private static final TaskRegistrationKey REPROCESS_ACTION = TaskRegistrationKey.of("reprocess");
- private static final String ACTION_PARAMETER = "action";
private final JsonTransformer jsonTransformer;
private final MailRepositoryStoreService repositoryStoreService;
@@ -354,7 +353,7 @@ public class MailRepositoriesRoutes implements Routes {
.omitEmptyStrings()
.splitToList(additionalFieldsParam)
.stream()
- .map((field) -> AdditionalField.find(field).orElseThrow(() -> new IllegalArgumentException(field)))
+ .map(field -> AdditionalField.find(field).orElseThrow(() -> new IllegalArgumentException(field)))
.collect(ImmutableSet.toImmutableSet());
}
diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTask.java b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTask.java
index be5a52b..0e4a0d3 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTask.java
+++ b/server/protocols/webadmin/webadmin-mailrepository/src/main/java/org/apache/james/webadmin/service/ClearMailRepositoryTask.java
@@ -123,7 +123,7 @@ public class ClearMailRepositoryTask implements Task {
}
private void removeAllInAllRepositories() throws MessagingException {
- mailRepositories.forEach(Throwing.consumer(MailRepository::removeAll));
+ mailRepositories.forEach(Throwing.consumer(MailRepository::removeAll).sneakyThrow());
}
@Override
diff --git a/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java b/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java
index 73d7113..3fb9572 100644
--- a/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java
@@ -81,7 +81,7 @@ import com.google.common.collect.ImmutableList;
import io.restassured.RestAssured;
import spark.Service;
-public class Pop3MetaDataFixInconsistenciesRoutesTest {
+class Pop3MetaDataFixInconsistenciesRoutesTest {
private static final class Pop3MetaDataFixInconsistenciesRoute implements Routes {
diff --git a/server/protocols/webadmin/webadmin-rabbitmq/src/main/java/org/apache/james/webadmin/routes/RabbitMQMailQueuesRoutes.java b/server/protocols/webadmin/webadmin-rabbitmq/src/main/java/org/apache/james/webadmin/routes/RabbitMQMailQueuesRoutes.java
index 1e01593..455d2e6 100644
--- a/server/protocols/webadmin/webadmin-rabbitmq/src/main/java/org/apache/james/webadmin/routes/RabbitMQMailQueuesRoutes.java
+++ b/server/protocols/webadmin/webadmin-rabbitmq/src/main/java/org/apache/james/webadmin/routes/RabbitMQMailQueuesRoutes.java
@@ -41,7 +41,6 @@ import org.apache.james.task.TaskManager;
import org.apache.james.util.DurationParser;
import org.apache.james.webadmin.Routes;
import org.apache.james.webadmin.service.RepublishNotprocessedMailsTask;
-import org.apache.james.webadmin.tasks.TaskFromRequest;
import org.apache.james.webadmin.tasks.TaskFromRequestRegistry;
import org.apache.james.webadmin.tasks.TaskRegistrationKey;
import org.apache.james.webadmin.utils.ErrorResponder;
@@ -84,7 +83,6 @@ public class RabbitMQMailQueuesRoutes implements Routes {
}
public void republishNotProcessedMails(Service service) {
- TaskFromRequest taskFromRequest = this::republishNotProcessedMails;
service.post(BASE_URL + SEPARATOR + MAIL_QUEUE_NAME,
TaskFromRequestRegistry.builder()
.register(REPUBLISH_NOT_PROCESSED_MAILS_REGISTRATION_KEY, this::republishNotProcessedMails)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org