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:50 UTC
[james-project] branch master updated (1753df1f -> a39fe45)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 1753df1f JAMES-3693 Add getModule to provide Redis Configuration in RedisExtension
new c68984d [SONAR] Run inspections for WebAdmin projects
new a27737e [SONAR] Run inspections for Backend projects
new d95e7cb [SONAR] Run inspections for Tasks projects
new 03182dc [SONAR] Solve some minor warnings in mailet projects
new a39fe45 [SONAR] Solve some minor warnings in server/data projects
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../backends/cassandra/init/ClusterFactory.java | 4 +-
.../CassandraConsistenciesConfiguration.java | 3 +-
.../init/configuration/ClusterConfiguration.java | 2 -
.../init/configuration/KeyspaceConfiguration.java | 5 -
.../configuration/QueryLoggerConfiguration.java | 8 +-
.../versions/CassandraSchemaVersionDAOTest.java | 4 +-
.../backends/es/v7/DeleteByQueryPerformer.java | 3 -
.../james/backends/rabbitmq/QueueArguments.java | 2 +-
.../backends/rabbitmq/RabbitMQConfiguration.java | 28 ++--
.../backends/rabbitmq/RabbitMQManagementAPI.java | 4 +-
.../WebAdminReIndexingTaskSerializationModule.java | 10 +-
.../jmap/cassandra/upload/UploadConfiguration.java | 2 +-
.../domainlist/lib/DomainListConfiguration.java | 2 +-
.../james/jdkim/mailets/CRLFOutputStream.java | 2 +
.../jdkim/mailets/HeaderSkippingOutputStream.java | 2 +
.../mailetcontainer/impl/MailetConfigImpl.java | 5 +-
.../impl/jmx/MailProcessorManagement.java | 11 --
.../org/apache/james/transport/mailets/Bounce.java | 2 +-
.../james/transport/mailets/RemoteDelivery.java | 9 --
.../transport/mailets/delivery/MailDispatcher.java | 3 +-
.../transport/mailets/jsieve/RejectAction.java | 2 +-
.../mailets/jsieve/delivery/SieveExecutor.java | 2 +-
.../mailets/redirect/ProcessRedirectNotify.java | 2 +-
.../transport/mailets/remote/delivery/Bouncer.java | 2 +-
.../mailets/remote/delivery/MailDelivrer.java | 2 +-
.../delivery/RemoteDeliveryConfiguration.java | 6 +-
.../delivery/RemoteDeliverySocketFactory.java | 143 ---------------------
.../transport/matchers/NetworkIsInWhitelist.java | 12 +-
.../transport/mailets/NotifyPostmasterTest.java | 2 +-
.../james/transport/mailets/NotifySenderTest.java | 2 +-
.../RecipientRewriteTableProcessorTest.java | 10 +-
.../mailets/RecipientRewriteTableTest.java | 2 +-
.../james/transport/mailets/RequeueTest.java | 4 +-
.../apache/james/transport/mailets/ResendTest.java | 2 +-
.../transport/mailets/ResourceLocatorTest.java | 4 +-
.../james/transport/mailets/ToRepositoryTest.java | 2 +-
.../mailets/delivery/MailboxAppenderImplTest.java | 2 +-
.../managesieve/ManageSieveMailetTestCase.java | 2 +-
.../mailets/redirect/MailModifierTest.java | 15 ++-
.../mailets/redirect/MessageAlteringUtilsTest.java | 2 +-
.../redirect/RedirectMailetInitParametersTest.java | 90 ++++++-------
.../remote/delivery/HeloNameProviderTest.java | 2 +-
.../delivery/InternetAddressConverterTest.java | 2 +-
.../delivery/RemoteDeliveryConfigurationTest.java | 10 +-
.../remote/delivery/RemoteDeliveryTest.java | 2 +-
.../mailets/remote/delivery/RepeatTest.java | 2 +-
.../transport/matchers/IsMarkedAsSpamTest.java | 2 +-
.../james/transport/matchers/IsOverQuotaTest.java | 2 +-
.../IsRemoteDeliveryPermanentErrorTest.java | 2 +-
.../IsRemoteDeliveryTemporaryErrorTest.java | 2 +-
.../matchers/RemoteAddrInNetworkTest.java | 2 +-
.../RemoteDeliveryFailedWithSMTPCodeTest.java | 2 +-
.../james/transport/util/MailAddressUtilsTest.java | 2 +-
.../transport/util/SpecialAddressesUtilsTest.java | 2 +-
.../james/rate/limiter/RedisExtensionTest.java | 2 +-
.../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 +-
.../dto/WebAdminUserReprocessingDTOTest.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 -
.../json/dto/AdditionalInformationDTOModule.java | 5 -
.../org/apache/james/task/MemoryWorkQueue.java | 2 +-
.../java/org/apache/james/task/TaskWithIdTest.java | 6 +-
106 files changed, 241 insertions(+), 486 deletions(-)
delete mode 100644 server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java
delete mode 100644 server/protocols/webadmin/webadmin-cassandra/src/main/java/org/apache/james/webadmin/service/CassandraMigrationService.java
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 01/05: [SONAR] Run inspections for WebAdmin projects
Posted by bt...@apache.org.
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
[james-project] 03/05: [SONAR] Run inspections for Tasks projects
Posted by bt...@apache.org.
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 d95e7cbea4e734f0af6e4d8c05d2cb961b79e81b
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Feb 20 13:30:39 2022 +0700
[SONAR] Run inspections for Tasks projects
---
.../apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java | 4 ++--
.../james/server/task/json/dto/AdditionalInformationDTOModule.java | 5 -----
.../src/main/java/org/apache/james/task/MemoryWorkQueue.java | 2 +-
.../src/test/java/org/apache/james/task/TaskWithIdTest.java | 6 +++---
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java
index 09f49f3..bce12a9 100644
--- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/dto/WebAdminUserReprocessingDTOTest.java
@@ -72,7 +72,7 @@ class WebAdminUserReprocessingDTOTest {
String json =
JsonGenericSerializer.forModules(WebAdminUserReindexingTaskAdditionalInformationDTO
- .serializationModule(new TestId.Factory()))
+ .serializationModule())
.withoutNestedType()
.serialize(domainObject);
@@ -83,7 +83,7 @@ class WebAdminUserReprocessingDTOTest {
@Test
void deserializeShouldNotBeSupported() {
assertThatThrownBy(() -> JsonGenericSerializer.forModules(WebAdminUserReindexingTaskAdditionalInformationDTO
- .serializationModule(new TestId.Factory()))
+ .serializationModule())
.withoutNestedType()
.deserialize(serializedAdditionalInformation))
.isInstanceOf(InvalidDefinitionException.class);
diff --git a/server/task/task-json/src/main/java/org/apache/james/server/task/json/dto/AdditionalInformationDTOModule.java b/server/task/task-json/src/main/java/org/apache/james/server/task/json/dto/AdditionalInformationDTOModule.java
index 59af490..9a4f4fa 100644
--- a/server/task/task-json/src/main/java/org/apache/james/server/task/json/dto/AdditionalInformationDTOModule.java
+++ b/server/task/task-json/src/main/java/org/apache/james/server/task/json/dto/AdditionalInformationDTOModule.java
@@ -19,15 +19,10 @@
package org.apache.james.server.task.json.dto;
import org.apache.james.json.DTOModule;
-import org.apache.james.task.Task;
import org.apache.james.task.TaskExecutionDetails;
public class AdditionalInformationDTOModule<T extends TaskExecutionDetails.AdditionalInformation, U extends AdditionalInformationDTO> extends DTOModule<T, U> {
- public static <TaskTypeT extends Task> Builder<TaskTypeT> forAdditionalInformation(Class<TaskTypeT> taskType) {
- return new Builder<>(taskType);
- }
-
public AdditionalInformationDTOModule(DTOConverter<T, U> converter, DomainObjectConverter<T, U> toDomainObjectConverter, Class<T> domainObjectType, Class<U> dtoType, String typeName) {
super(converter, toDomainObjectConverter, domainObjectType, dtoType, typeName);
}
diff --git a/server/task/task-memory/src/main/java/org/apache/james/task/MemoryWorkQueue.java b/server/task/task-memory/src/main/java/org/apache/james/task/MemoryWorkQueue.java
index 4446bd4..71275f2 100644
--- a/server/task/task-memory/src/main/java/org/apache/james/task/MemoryWorkQueue.java
+++ b/server/task/task-memory/src/main/java/org/apache/james/task/MemoryWorkQueue.java
@@ -57,7 +57,7 @@ public class MemoryWorkQueue implements WorkQueue {
public void close() throws IOException {
try {
subscription.dispose();
- } catch (Throwable ignore) {
+ } catch (Exception ignore) {
//avoid failing during close
}
worker.close();
diff --git a/server/task/task-memory/src/test/java/org/apache/james/task/TaskWithIdTest.java b/server/task/task-memory/src/test/java/org/apache/james/task/TaskWithIdTest.java
index 40efa89..59462ab 100644
--- a/server/task/task-memory/src/test/java/org/apache/james/task/TaskWithIdTest.java
+++ b/server/task/task-memory/src/test/java/org/apache/james/task/TaskWithIdTest.java
@@ -23,10 +23,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.Test;
-public class TaskWithIdTest {
+class TaskWithIdTest {
@Test
- public void twoTasksWithSameIdShouldBeEqual() {
+ void twoTasksWithSameIdShouldBeEqual() {
TaskId id = TaskId.generateTaskId();
Task task1 = new MemoryReferenceTask(() -> Task.Result.COMPLETED);
Task task2 = new MemoryReferenceTask(() -> Task.Result.COMPLETED);
@@ -36,7 +36,7 @@ public class TaskWithIdTest {
}
@Test
- public void sameTaskWithDifferentIdShouldNotBeEqual() {
+ void sameTaskWithDifferentIdShouldNotBeEqual() {
TaskId id1 = TaskId.generateTaskId();
TaskId id2 = TaskId.generateTaskId();
Task task = new MemoryReferenceTask(() -> Task.Result.COMPLETED);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 04/05: [SONAR] Solve some minor warnings in mailet projects
Posted by bt...@apache.org.
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 03182dca75c0220d73f0dd997b47eb362219fa3c
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Feb 21 15:24:22 2022 +0700
[SONAR] Solve some minor warnings in mailet projects
---
.../james/jdkim/mailets/CRLFOutputStream.java | 2 +
.../jdkim/mailets/HeaderSkippingOutputStream.java | 2 +
.../mailetcontainer/impl/MailetConfigImpl.java | 5 +-
.../impl/jmx/MailProcessorManagement.java | 11 --
.../org/apache/james/transport/mailets/Bounce.java | 2 +-
.../james/transport/mailets/RemoteDelivery.java | 9 --
.../transport/mailets/delivery/MailDispatcher.java | 3 +-
.../transport/mailets/jsieve/RejectAction.java | 2 +-
.../mailets/jsieve/delivery/SieveExecutor.java | 2 +-
.../mailets/redirect/ProcessRedirectNotify.java | 2 +-
.../transport/mailets/remote/delivery/Bouncer.java | 2 +-
.../mailets/remote/delivery/MailDelivrer.java | 2 +-
.../delivery/RemoteDeliveryConfiguration.java | 6 +-
.../delivery/RemoteDeliverySocketFactory.java | 143 ---------------------
.../transport/matchers/NetworkIsInWhitelist.java | 12 +-
.../transport/mailets/NotifyPostmasterTest.java | 2 +-
.../james/transport/mailets/NotifySenderTest.java | 2 +-
.../RecipientRewriteTableProcessorTest.java | 10 +-
.../mailets/RecipientRewriteTableTest.java | 2 +-
.../james/transport/mailets/RequeueTest.java | 4 +-
.../apache/james/transport/mailets/ResendTest.java | 2 +-
.../transport/mailets/ResourceLocatorTest.java | 4 +-
.../james/transport/mailets/ToRepositoryTest.java | 2 +-
.../mailets/delivery/MailboxAppenderImplTest.java | 2 +-
.../managesieve/ManageSieveMailetTestCase.java | 2 +-
.../mailets/redirect/MailModifierTest.java | 15 ++-
.../mailets/redirect/MessageAlteringUtilsTest.java | 2 +-
.../redirect/RedirectMailetInitParametersTest.java | 90 ++++++-------
.../remote/delivery/HeloNameProviderTest.java | 2 +-
.../delivery/InternetAddressConverterTest.java | 2 +-
.../delivery/RemoteDeliveryConfigurationTest.java | 10 +-
.../remote/delivery/RemoteDeliveryTest.java | 2 +-
.../mailets/remote/delivery/RepeatTest.java | 2 +-
.../transport/matchers/IsMarkedAsSpamTest.java | 2 +-
.../james/transport/matchers/IsOverQuotaTest.java | 2 +-
.../IsRemoteDeliveryPermanentErrorTest.java | 2 +-
.../IsRemoteDeliveryTemporaryErrorTest.java | 2 +-
.../matchers/RemoteAddrInNetworkTest.java | 2 +-
.../RemoteDeliveryFailedWithSMTPCodeTest.java | 2 +-
.../james/transport/util/MailAddressUtilsTest.java | 2 +-
.../transport/util/SpecialAddressesUtilsTest.java | 2 +-
.../james/rate/limiter/RedisExtensionTest.java | 2 +-
42 files changed, 100 insertions(+), 280 deletions(-)
diff --git a/server/mailet/dkim/src/main/java/org/apache/james/jdkim/mailets/CRLFOutputStream.java b/server/mailet/dkim/src/main/java/org/apache/james/jdkim/mailets/CRLFOutputStream.java
index 5610cf0..d6d9084 100644
--- a/server/mailet/dkim/src/main/java/org/apache/james/jdkim/mailets/CRLFOutputStream.java
+++ b/server/mailet/dkim/src/main/java/org/apache/james/jdkim/mailets/CRLFOutputStream.java
@@ -68,6 +68,7 @@ public class CRLFOutputStream extends FilterOutputStream {
* @throws IOException
* if an error occurs writing the byte
*/
+ @Override
public void write(int b) throws IOException {
switch (b) {
case '\r':
@@ -107,6 +108,7 @@ public class CRLFOutputStream extends FilterOutputStream {
/**
* @see java.io.FilterOutputStream#write(byte[], int, int)
*/
+ @Override
public synchronized void write(byte[] buffer, int offset, int length)
throws IOException {
/* optimized */
diff --git a/server/mailet/dkim/src/main/java/org/apache/james/jdkim/mailets/HeaderSkippingOutputStream.java b/server/mailet/dkim/src/main/java/org/apache/james/jdkim/mailets/HeaderSkippingOutputStream.java
index 5ccfbb0..46f5178 100644
--- a/server/mailet/dkim/src/main/java/org/apache/james/jdkim/mailets/HeaderSkippingOutputStream.java
+++ b/server/mailet/dkim/src/main/java/org/apache/james/jdkim/mailets/HeaderSkippingOutputStream.java
@@ -36,6 +36,7 @@ public class HeaderSkippingOutputStream extends FilterOutputStream {
super(out);
}
+ @Override
public void write(byte[] b, int off, int len) throws IOException {
if (inHeaders) {
for (int i = off; i < off + len; i++) {
@@ -57,6 +58,7 @@ public class HeaderSkippingOutputStream extends FilterOutputStream {
}
}
+ @Override
public void write(int b) throws IOException {
if (inHeaders) {
if (skipTo[pos] == b) {
diff --git a/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
index e5b30ab..d6ca5d4 100644
--- a/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
+++ b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetConfigImpl.java
@@ -44,10 +44,7 @@ public class MailetConfigImpl implements MailetConfig {
/** The mailet name */
private String name;
- // This would probably be better.
- // Properties params = new Properties();
- // Instead, we're tied to the Configuration object
- /** The mailet Avalon Configuration */
+ /** The mailet Configuration */
private Configuration configuration;
/**
diff --git a/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
index 893a83a..b8b6793 100644
--- a/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
+++ b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
@@ -73,17 +73,6 @@ public class MailProcessorManagement extends StandardMBean implements MailProces
return getSuccessCount() + getErrorCount();
}
- /*
- * TODO
- * Is deprecated or dead code? Can't find an interface defining this method
- *
- * @see
- * org.apache.james.mailetcontainer.api.jmx.MailProcessorDetailMBean#getName()
- */
- public String getName() {
- return processorName;
- }
-
@Override
public long getFastestProcessing() {
return fastestProcessing.get();
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java
index 4b59cf6..2dee229 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java
@@ -246,7 +246,7 @@ public class Bounce extends GenericMailet implements RedirectNotify {
}
}
- private void passThrough(Mail originalMail) throws MessagingException {
+ private void passThrough(Mail originalMail) {
if (getInitParameters().isDebug()) {
LOGGER.debug("Processing a bounce request for a message with an empty reverse-path. No bounce will be sent.");
}
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
index 67e95d5..b0f080c 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
@@ -20,7 +20,6 @@
package org.apache.james.transport.mailets;
import java.io.IOException;
-import java.net.UnknownHostException;
import java.util.Collection;
import java.util.Map;
@@ -39,7 +38,6 @@ import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.transport.mailets.remote.delivery.Bouncer;
import org.apache.james.transport.mailets.remote.delivery.DeliveryRunnable;
import org.apache.james.transport.mailets.remote.delivery.RemoteDeliveryConfiguration;
-import org.apache.james.transport.mailets.remote.delivery.RemoteDeliverySocketFactory;
import org.apache.mailet.Mail;
import org.apache.mailet.base.GenericMailet;
import org.slf4j.Logger;
@@ -172,13 +170,6 @@ public class RemoteDelivery extends GenericMailet {
public void init() throws MessagingException {
configuration = new RemoteDeliveryConfiguration(getMailetConfig(), domainList);
queue = queueFactory.createQueue(configuration.getOutGoingQueueName());
- try {
- if (configuration.isBindUsed()) {
- RemoteDeliverySocketFactory.setBindAdress(configuration.getBindAddress());
- }
- } catch (UnknownHostException e) {
- LOGGER.error("Invalid bind setting ({}): ", configuration.getBindAddress(), e);
- }
deliveryRunnable = new DeliveryRunnable(queue,
configuration,
dnsServer,
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
index a7eec28..b8cb379 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
@@ -129,8 +129,7 @@ public class MailDispatcher {
// This only works because there is a placeholder inserted by MimeMessageWrapper
message.setHeader(RFC2822Headers.RETURN_PATH, mail.getMaybeSender().asPrettyString());
- List<MailAddress> errors = deliver(mail, message);
- return errors;
+ return deliver(mail, message);
}
private List<MailAddress> deliver(Mail mail, MimeMessage message) {
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
index fd8a898..a35ebc6 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
@@ -142,7 +142,7 @@ public class RejectAction implements MailAction {
MailImpl mail = MailImpl.builder()
.name(MailImpl.getId())
.addRecipients(Arrays.stream(recipientAddresses)
- .map(address -> (InternetAddress) address)
+ .map(InternetAddress.class::cast)
.map(Throwing.function(MailAddress::new))
.collect(ImmutableList.toImmutableList()))
.mimeMessage(reply)
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java
index e6d9a7a..ad79440 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java
@@ -119,7 +119,7 @@ public class SieveExecutor {
Preconditions.checkNotNull(recipient, "Recipient for mail to be spooled cannot be null.");
Preconditions.checkNotNull(mail.getMessage(), "Mail message to be spooled cannot be null.");
boolean isSieveNotification = AttributeUtils.getValueAndCastFromMail(mail, SIEVE_NOTIFICATION, Boolean.class).orElse(false);
- return !isSieveNotification ? sieveMessage(recipient, mail) : false;
+ return !isSieveNotification && sieveMessage(recipient, mail);
}
private boolean sieveMessage(MailAddress recipient, Mail aMail) {
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java
index 7bb7366..e59e539 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/ProcessRedirectNotify.java
@@ -178,7 +178,7 @@ public class ProcessRedirectNotify {
* true for the sender host part
*/
@SuppressWarnings("deprecation")
- private boolean senderDomainIsValid(Mail mail) throws MessagingException {
+ private boolean senderDomainIsValid(Mail mail) {
return !mailet.getInitParameters().getFakeDomainCheck()
|| !mail.hasSender()
|| !mailet.getMailetContext()
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/Bouncer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/Bouncer.java
index 92ae455..f5e2789 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/Bouncer.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/Bouncer.java
@@ -73,7 +73,7 @@ public class Bouncer {
private Optional<Attribute> computeErrorCode(Exception ex) {
return Optional.ofNullable(ex)
- .filter(e -> e instanceof MessagingException)
+ .filter(MessagingException.class::isInstance)
.map(MessagingException.class::cast)
.map(EnhancedMessagingException::new)
.flatMap(EnhancedMessagingException::getReturnCode)
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/MailDelivrer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/MailDelivrer.java
index 04dfa2f..34dd22a 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/MailDelivrer.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/MailDelivrer.java
@@ -187,7 +187,7 @@ public class MailDelivrer {
private MessagingException handleMessagingException(Mail mail, MessagingException me) throws MessagingException {
LOGGER.debug("Exception delivering message ({}) - {}", mail.getName(), me.getMessage());
- if ((me.getNextException() != null) && (me.getNextException() instanceof IOException)) {
+ if (me.getNextException() instanceof IOException) {
// If it's an IO exception with no nested exception, it's probably
// some socket or weird I/O related problem.
return me;
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryConfiguration.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryConfiguration.java
index 036106e..493a15a 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryConfiguration.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryConfiguration.java
@@ -237,11 +237,7 @@ public class RemoteDeliveryConfiguration {
props.put("mail." + protocol + ".localhost", heloNameProvider.getHeloName());
props.put("mail." + protocol + ".starttls.enable", String.valueOf(startTLS));
if (isBindUsed()) {
- // undocumented JavaMail 1.2 feature, smtp transport will use
- // our socket factory, which will also set the local address
- props.put("mail." + protocol + ".socketFactory.class", RemoteDeliverySocketFactory.class);
- // Don't fallback to the standard socket factory on error, do throw an exception
- props.put("mail." + protocol + ".socketFactory.fallback", "false");
+ props.put("mail." + protocol + ".localaddress", bindAddress);
}
if (authUser != null) {
props.put("mail." + protocol + ".auth", "true");
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java
deleted file mode 100644
index cd22059..0000000
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliverySocketFactory.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.transport.mailets.remote.delivery;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-
-import javax.net.SocketFactory;
-
-/**
- * <p>
- * It is used by RemoteDelivery in order to make possible to bind the client
- * socket to a specific ip address.
- * </p>
- * <p>
- * This is not a nice solution because the ip address must be shared by all
- * RemoteDelivery instances. It would be better to modify JavaMail (current
- * version 1.3) to support a corresonding property, e.g. mail.smtp.bindAdress.
- * </p>
- * <p>
- * This used to not extend javax.net.SocketFactory descendant, because
- * <ol>
- * <li>
- * it was not necessary because JavaMail 1.2 uses reflection when accessing this
- * class;</li>
- * <li>
- * it was not desirable because it would require java 1.4.</li>
- * </ol>
- * </p>
- * <p>
- * But since James 2.3.0a1:
- * <ol>
- * <li>we require Java 1.4 so the dependency on SocketFactory is not really an
- * issue;</li>
- * <li>Javamail 1.4 cast the object returned by getDefault to SocketFactory and
- * fails to create the socket if we don't extend SocketFactory.</li>
- * </ol>
- * </p>
- * <p>
- * <strong>Note</strong>: Javamail 1.4 should correctly support
- * mail.smtp.localaddr so we could probably get rid of this class and simply add
- * that property to the Session.
- * </p>
- */
-public class RemoteDeliverySocketFactory extends SocketFactory {
-
- /**
- * @param addr
- * the ip address or host name the delivery socket will bind to
- */
- public static void setBindAdress(String addr) throws UnknownHostException {
- if (addr == null) {
- bindAddress = null;
- } else {
- bindAddress = InetAddress.getByName(addr);
- }
- }
-
- /**
- * the same as the similarly named javax.net.SocketFactory operation.
- */
- public static SocketFactory getDefault() {
- return new RemoteDeliverySocketFactory();
- }
-
- /**
- * the same as the similarly named javax.net.SocketFactory operation. Just
- * to be safe, it is not used by JavaMail 1.3. This is the only method used
- * by JavaMail 1.4.
- */
- @Override
- public Socket createSocket() throws IOException {
- Socket s = new Socket();
- s.bind(new InetSocketAddress(bindAddress, 0));
- return s;
- }
-
- /**
- * the same as the similarly named javax.net.SocketFactory operation. This
- * is the one which is used by JavaMail 1.3. This is not used by JavaMail
- * 1.4.
- */
- @Override
- public Socket createSocket(String host, int port) throws IOException {
- return new Socket(host, port, bindAddress, 0);
- }
-
- /**
- * the same as the similarly named javax.net.SocketFactory operation. Just
- * to be safe, it is not used by JavaMail 1.3. This is not used by JavaMail
- * 1.4.
- */
- @Override
- public Socket createSocket(String host, int port, InetAddress clientHost, int clientPort) throws IOException {
- return new Socket(host, port, clientHost == null ? bindAddress : clientHost, clientPort);
- }
-
- /**
- * the same as the similarly named javax.net.SocketFactory operation. Just
- * to be safe, it is not used by JavaMail 1.3. This is not used by JavaMail
- * 1.4.
- */
- @Override
- public Socket createSocket(InetAddress host, int port) throws IOException {
- return new Socket(host, port, bindAddress, 0);
- }
-
- /**
- * the same as the similarly named javax.net.SocketFactory operation. Just
- * to be safe, it is not used by JavaMail 1.3. This is not used by JavaMail
- * 1.4.
- */
- @Override
- public Socket createSocket(InetAddress address, int port, InetAddress clientAddress, int clientPort) throws IOException {
- return new Socket(address, port, clientAddress == null ? bindAddress : clientAddress, clientPort);
- }
-
- /**
- * it should be set by setBindAdress(). Null means the socket is bind to the
- * default address.
- */
- private static InetAddress bindAddress;
-}
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
index 46e5df2..a582246 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
@@ -34,8 +34,6 @@ import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
import org.apache.mailet.Experimental;
import org.apache.mailet.Mail;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* <p>
@@ -51,8 +49,6 @@ import org.slf4j.LoggerFactory;
*/
@Experimental
public class NetworkIsInWhitelist extends AbstractSQLWhitelistMatcher {
- private static final Logger LOGGER = LoggerFactory.getLogger(NetworkIsInWhitelist.class);
-
private DNSService dns;
private String selectNetworks;
@@ -87,15 +83,11 @@ public class NetworkIsInWhitelist extends AbstractSQLWhitelistMatcher {
String recipientUser = recipientMailAddress.getLocalPart().toLowerCase(Locale.US);
String recipientHost = recipientMailAddress.getDomain().asString();
- if (conn == null) {
- conn = datasource.getConnection();
- }
+ conn = datasource.getConnection();
List<String> nets = new ArrayList<>();
try {
- if (selectStmt == null) {
- selectStmt = conn.prepareStatement(selectNetworks);
- }
+ selectStmt = conn.prepareStatement(selectNetworks);
selectStmt.setString(1, recipientUser);
selectStmt.setString(2, recipientHost);
selectRS = selectStmt.executeQuery();
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java
index 8c50ca3..5d967fc 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java
@@ -39,7 +39,7 @@ import org.apache.mailet.base.test.FakeMailetConfig;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class NotifyPostmasterTest {
+class NotifyPostmasterTest {
private static final String MAILET_NAME = "mailetName";
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java
index 665777d..eae8ba8 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java
@@ -39,7 +39,7 @@ import org.apache.mailet.base.test.FakeMailetConfig;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class NotifySenderTest {
+class NotifySenderTest {
private static final String MAILET_NAME = "mailetName";
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java
index 9fee75e..1744358 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java
@@ -22,29 +22,21 @@ package org.apache.james.transport.mailets;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import java.util.Collection;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.james.core.Domain;
import org.apache.james.core.MailAddress;
import org.apache.james.dnsservice.api.InMemoryDNSService;
import org.apache.james.domainlist.lib.DomainListConfiguration;
import org.apache.james.domainlist.memory.MemoryDomainList;
-import org.apache.james.rrt.api.RecipientRewriteTable.ErrorMappingException;
import org.apache.james.rrt.api.RecipientRewriteTableConfiguration;
-import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.rrt.lib.Mapping;
import org.apache.james.rrt.lib.MappingSource;
-import org.apache.james.rrt.lib.Mappings;
import org.apache.james.rrt.lib.MappingsImpl;
import org.apache.james.rrt.memory.MemoryRecipientRewriteTable;
import org.apache.james.util.MimeMessageUtil;
@@ -94,7 +86,7 @@ class RecipientRewriteTableProcessorTest {
}
@Test
- public void handleMappingsShouldThrowExceptionWhenMappingsContainAtLeastOneNoneDomainObjectButCannotGetDefaultDomain() throws Exception {
+ void handleMappingsShouldThrowExceptionWhenMappingsContainAtLeastOneNoneDomainObjectButCannotGetDefaultDomain() throws Exception {
mappings = MappingsImpl.builder()
.add(MailAddressFixture.ANY_AT_JAMES.toString())
.add(NONEDOMAIN)
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
index a085170..49a09f0 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
@@ -65,7 +65,7 @@ class RecipientRewriteTableTest {
}
@Test
- public void serviceShouldThrowExceptionWithNullMail() {
+ void serviceShouldThrowExceptionWithNullMail() {
assertThatThrownBy(() -> mailet.service(null))
.isInstanceOf(NullPointerException.class);
}
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RequeueTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RequeueTest.java
index 84cef00..2893342 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RequeueTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RequeueTest.java
@@ -45,7 +45,7 @@ import org.junit.jupiter.api.Test;
import reactor.core.publisher.Flux;
-public class RequeueTest {
+class RequeueTest {
private Mail mailSample;
private MailQueueFactory<?> mailQueueFactory;
private MailQueue spoolQueue;
@@ -179,7 +179,7 @@ public class RequeueTest {
.block();
assertThat(mailQueueItem).isNotNull();
- assertThat(Duration.between(enqueueTime, dequeueTime.get()).abs().toSeconds()).isEqualTo(0);
+ assertThat(Duration.between(enqueueTime, dequeueTime.get()).abs().toSeconds()).isZero();
}
@Test
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java
index 92b8a4d..260a05b 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java
@@ -39,7 +39,7 @@ import org.apache.mailet.base.test.FakeMailetConfig;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class ResendTest {
+class ResendTest {
private static final String MAILET_NAME = "mailetName";
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java
index c630e90..c05d00f 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java
@@ -53,7 +53,7 @@ class ResourceLocatorTest {
}
@Test
- public void resourceLocatorImplShouldPropagateScriptNotFound() throws Exception {
+ void resourceLocatorImplShouldPropagateScriptNotFound() throws Exception {
when(sieveRepository.getActive(USERNAME)).thenThrow(new ScriptNotFoundException());
when(usersRepository.getUsername(mailAddress)).thenReturn(Username.of(RECEIVER_LOCALHOST));
@@ -62,7 +62,7 @@ class ResourceLocatorTest {
}
@Test
- public void resourceLocatorImplShouldWork() throws Exception {
+ void resourceLocatorImplShouldWork() throws Exception {
InputStream inputStream = new ByteArrayInputStream(new byte[0]);
when(sieveRepository.getActive(USERNAME)).thenReturn(inputStream);
when(usersRepository.getUsername(mailAddress)).thenReturn(Username.of(RECEIVER_LOCALHOST));
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
index 7ed4d8b..0a25b79 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
@@ -37,7 +37,7 @@ import org.apache.mailet.base.test.MailUtil;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class ToRepositoryTest {
+class ToRepositoryTest {
public static final String REPOSITORY_PATH = "file://var/mail/any";
private ToRepository mailet;
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderImplTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderImplTest.java
index 2dd8544..e50ffa4 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderImplTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/MailboxAppenderImplTest.java
@@ -43,7 +43,7 @@ import org.junit.jupiter.api.Test;
import reactor.core.publisher.Mono;
-public class MailboxAppenderImplTest {
+class MailboxAppenderImplTest {
public static final Username USER = Username.of("user");
public static final String FOLDER = "folder";
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java
index dc1fd8d..cdb0475 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/managesieve/ManageSieveMailetTestCase.java
@@ -60,7 +60,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.Lists;
-public class ManageSieveMailetTestCase {
+class ManageSieveMailetTestCase {
public static final Username USERNAME = Username.of("test@localhost");
public static final ScriptName SCRIPT_NAME = new ScriptName("scriptName");
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java
index d15d6f2..a10f82c 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.james.transport.mailets.redirect;
+import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
@@ -25,7 +26,7 @@ import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.server.core.MailImpl;
import org.junit.jupiter.api.Test;
-public class MailModifierTest {
+class MailModifierTest {
@Test
void buildShouldThrowWhenMailetIsNull() {
@@ -55,10 +56,12 @@ public class MailModifierTest {
@Test
void buildShouldWorkWhenEverythingProvided() {
- MailModifier.builder()
- .mailet(mock(RedirectNotify.class))
- .mail(mock(MailImpl.class))
- .dns(mock(DNSService.class))
- .build();
+ assertThatCode(() ->
+ MailModifier.builder()
+ .mailet(mock(RedirectNotify.class))
+ .mail(mock(MailImpl.class))
+ .dns(mock(DNSService.class))
+ .build())
+ .doesNotThrowAnyException();
}
}
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MessageAlteringUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MessageAlteringUtilsTest.java
index 9b7da2a..9fab2d8 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MessageAlteringUtilsTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MessageAlteringUtilsTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.mock;
import org.apache.mailet.Mail;
import org.junit.jupiter.api.Test;
-public class MessageAlteringUtilsTest {
+class MessageAlteringUtilsTest {
@Test
void buildShouldThrowWhenMailetIsNull() {
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java
index 5f3b11c..067d064 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java
@@ -43,7 +43,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getPassThroughShouldReturnTrueWhenSetToTrue() throws Exception {
+ void getPassThroughShouldReturnTrueWhenSetToTrue() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("passThrough", "true")
@@ -56,7 +56,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getPassThroughShouldReturnFalseWhenSetToFalse() throws Exception {
+ void getPassThroughShouldReturnFalseWhenSetToFalse() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("passThrough", "false")
@@ -69,7 +69,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getPassThroughShouldReturnFalseWhenNotSet() throws Exception {
+ void getPassThroughShouldReturnFalseWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -81,7 +81,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getFakeDomainCheckShouldReturnTrueWhenSetToTrue() throws Exception {
+ void getFakeDomainCheckShouldReturnTrueWhenSetToTrue() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("fakeDomainCheck", "true")
@@ -94,7 +94,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getFakeDomainCheckShouldReturnFalseWhenSetToFalse() throws Exception {
+ void getFakeDomainCheckShouldReturnFalseWhenSetToFalse() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("fakeDomainCheck", "false")
@@ -107,7 +107,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getFakeDomainCheckShouldReturnFalseWhenNotSet() throws Exception {
+ void getFakeDomainCheckShouldReturnFalseWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -119,7 +119,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getInLineTypeShouldReturnValueWhenSet() throws Exception {
+ void getInLineTypeShouldReturnValueWhenSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("inline", "none")
@@ -132,7 +132,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getInLineTypeShouldReturnNoneWhenNotSet() throws Exception {
+ void getInLineTypeShouldReturnNoneWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -144,7 +144,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getAttachmentTypeShouldReturnValueWhenSet() throws Exception {
+ void getAttachmentTypeShouldReturnValueWhenSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("attachment", "unaltered")
@@ -157,7 +157,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getAttachmentTypeShouldReturnMessageWhenNotSet() throws Exception {
+ void getAttachmentTypeShouldReturnMessageWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -169,7 +169,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getMessageShouldReturnMessageValueWhenSet() throws Exception {
+ void getMessageShouldReturnMessageValueWhenSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("message", "my message")
@@ -182,7 +182,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getMessageShouldReturnEmptyWhenNotSet() throws Exception {
+ void getMessageShouldReturnEmptyWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -190,11 +190,11 @@ class RedirectMailetInitParametersTest {
InitParameters testee = RedirectMailetInitParameters.from(mailet);
String message = testee.getMessage();
- assertThat(message).isEqualTo("");
+ assertThat(message).isEmpty();
}
@Test
- public void getSubjectShouldReturnValueWhenSet() throws Exception {
+ void getSubjectShouldReturnValueWhenSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("subject", "my subject")
@@ -207,7 +207,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getSubjectShouldReturnNullWhenNotSet() throws Exception {
+ void getSubjectShouldReturnNullWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -219,7 +219,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getSubjectPrefixShouldReturnValueWhenSet() throws Exception {
+ void getSubjectPrefixShouldReturnValueWhenSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("prefix", "my prefix")
@@ -232,7 +232,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getSubjectPrefixShouldReturnNullWhenNotSet() throws Exception {
+ void getSubjectPrefixShouldReturnNullWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -244,7 +244,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isAttachErrorShouldReturnTrueWhenSetToTrue() throws Exception {
+ void isAttachErrorShouldReturnTrueWhenSetToTrue() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("attachError", "true")
@@ -257,7 +257,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isAttachErrorShouldReturnFalseWhenSetToFalse() throws Exception {
+ void isAttachErrorShouldReturnFalseWhenSetToFalse() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("attachError", "false")
@@ -270,7 +270,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isAttachErrorShouldReturnFalseWhenNotSet() throws Exception {
+ void isAttachErrorShouldReturnFalseWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -282,7 +282,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isReplyShouldReturnTrueWhenSetToTrue() throws Exception {
+ void isReplyShouldReturnTrueWhenSetToTrue() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("isReply", "true")
@@ -295,7 +295,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isReplyShouldReturnFalseWhenSetToFalse() throws Exception {
+ void isReplyShouldReturnFalseWhenSetToFalse() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("isReply", "false")
@@ -308,7 +308,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isReplyShouldReturnFalseWhenNotSet() throws Exception {
+ void isReplyShouldReturnFalseWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -320,7 +320,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getRecipientsShouldReturnValueWhenSet() throws Exception {
+ void getRecipientsShouldReturnValueWhenSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("recipients", "user@james.org, user2@james.org")
@@ -333,7 +333,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getRecipientsShouldReturnAbsentWhenEmpty() throws Exception {
+ void getRecipientsShouldReturnAbsentWhenEmpty() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("recipients", "")
@@ -346,7 +346,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getRecipientsShouldReturnAbsentWhenNotSet() throws Exception {
+ void getRecipientsShouldReturnAbsentWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -358,7 +358,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getToShouldReturnValueWhenSet() throws Exception {
+ void getToShouldReturnValueWhenSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("to", "user@james.org, user2@james.org")
@@ -371,7 +371,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getToShouldReturnAbsentWhenEmpty() throws Exception {
+ void getToShouldReturnAbsentWhenEmpty() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("to", "")
@@ -384,7 +384,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getToShouldReturnAbsentWhenNotSet() throws Exception {
+ void getToShouldReturnAbsentWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -396,7 +396,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getReversePathShouldReturnValueWhenSet() throws Exception {
+ void getReversePathShouldReturnValueWhenSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("reversePath", "user@james.org, user2@james.org")
@@ -409,7 +409,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getReversePathShouldReturnAbsentWhenEmpty() throws Exception {
+ void getReversePathShouldReturnAbsentWhenEmpty() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("reversePath", "")
@@ -422,7 +422,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getReversePathShouldReturnAbsentWhenNotSet() throws Exception {
+ void getReversePathShouldReturnAbsentWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -434,7 +434,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getSenderShouldReturnValueWhenSet() throws Exception {
+ void getSenderShouldReturnValueWhenSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("sender", "user@james.org, user2@james.org")
@@ -447,7 +447,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getSenderShouldReturnAbsentWhenEmpty() throws Exception {
+ void getSenderShouldReturnAbsentWhenEmpty() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("sender", "")
@@ -460,7 +460,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getSenderShouldReturnAbsentWhenNotSet() throws Exception {
+ void getSenderShouldReturnAbsentWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -472,7 +472,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getReplyToShouldReturnValueWhenSet() throws Exception {
+ void getReplyToShouldReturnValueWhenSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("replyTo", "user@james.org, user2@james.org")
@@ -485,7 +485,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getReplyToShouldReturnreplytoValueWhenSet() throws Exception {
+ void getReplyToShouldReturnreplytoValueWhenSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("replyto", "user@james.org, user2@james.org")
@@ -498,7 +498,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getReplyToShouldReturnAbsentWhenEmpty() throws Exception {
+ void getReplyToShouldReturnAbsentWhenEmpty() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("replyTo", "")
@@ -511,7 +511,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void getReplyToShouldReturnAbsentWhenNotSet() throws Exception {
+ void getReplyToShouldReturnAbsentWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -523,7 +523,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isDebugShouldReturnTrueWhenSetToTrue() throws Exception {
+ void isDebugShouldReturnTrueWhenSetToTrue() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("debug", "true")
@@ -536,7 +536,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isDebugShouldReturnFalseWhenSetToFalse() throws Exception {
+ void isDebugShouldReturnFalseWhenSetToFalse() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("debug", "false")
@@ -549,7 +549,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isDebugShouldReturnFalseWhenNotSet() throws Exception {
+ void isDebugShouldReturnFalseWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
@@ -561,7 +561,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isStaticShouldReturnTrueWhenSetToTrue() throws Exception {
+ void isStaticShouldReturnTrueWhenSetToTrue() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("static", "true")
@@ -574,7 +574,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isStaticShouldReturnFalseWhenSetToFalse() throws Exception {
+ void isStaticShouldReturnFalseWhenSetToFalse() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.setProperty("static", "false")
@@ -587,7 +587,7 @@ class RedirectMailetInitParametersTest {
}
@Test
- public void isStaticShouldReturnFalseWhenNotSet() throws Exception {
+ void isStaticShouldReturnFalseWhenNotSet() throws Exception {
FakeMailetConfig mailetConfig = FakeMailetConfig.builder()
.mailetName("mailet")
.build();
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/HeloNameProviderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/HeloNameProviderTest.java
index 02be85f..b9b0cb7 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/HeloNameProviderTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/HeloNameProviderTest.java
@@ -30,7 +30,7 @@ import org.apache.james.domainlist.api.DomainListException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class HeloNameProviderTest {
+class HeloNameProviderTest {
public static final String DOMAIN = "domain";
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/InternetAddressConverterTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/InternetAddressConverterTest.java
index c49acda..d033e9a 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/InternetAddressConverterTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/InternetAddressConverterTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
-public class InternetAddressConverterTest {
+class InternetAddressConverterTest {
@Test
void convertShouldWorkWithEmptyAddressList() {
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryConfigurationTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryConfigurationTest.java
index 65d9de0..e888faf 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryConfigurationTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryConfigurationTest.java
@@ -33,7 +33,7 @@ import org.apache.mailet.base.test.FakeMailetConfig;
import org.assertj.core.data.MapEntry;
import org.junit.jupiter.api.Test;
-public class RemoteDeliveryConfigurationTest {
+class RemoteDeliveryConfigurationTest {
@Test
void isDebugShouldBeFalseByDefault() {
@@ -107,7 +107,7 @@ public class RemoteDeliveryConfigurationTest {
.build();
assertThat(new RemoteDeliveryConfiguration(mailetConfig, mock(DomainList.class)).getSmtpTimeout())
- .isEqualTo(0);
+ .isZero();
}
@Test
@@ -177,7 +177,7 @@ public class RemoteDeliveryConfigurationTest {
.build();
assertThat(new RemoteDeliveryConfiguration(mailetConfig, mock(DomainList.class)).getConnectionTimeout())
- .isEqualTo(0);
+ .isZero();
}
@Test
@@ -379,7 +379,7 @@ public class RemoteDeliveryConfigurationTest {
.build();
assertThat(new RemoteDeliveryConfiguration(mailetConfig, mock(DomainList.class)).getDnsProblemRetry())
- .isEqualTo(0);
+ .isZero();
}
@Test
@@ -389,7 +389,7 @@ public class RemoteDeliveryConfigurationTest {
.build();
assertThat(new RemoteDeliveryConfiguration(mailetConfig, mock(DomainList.class)).getDnsProblemRetry())
- .isEqualTo(0);
+ .isZero();
}
@Test
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java
index 1445026..4694f6c 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java
@@ -55,7 +55,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-public class RemoteDeliveryTest {
+class RemoteDeliveryTest {
public static class MailProjection {
public static MailProjection from(Mail mail) {
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RepeatTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RepeatTest.java
index 2ea3f56..61df5ea 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RepeatTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RepeatTest.java
@@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.jupiter.api.Test;
-public class RepeatTest {
+class RepeatTest {
public static final String ELEMENT = "a";
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsMarkedAsSpamTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsMarkedAsSpamTest.java
index 7eaf2b4..d49c66e 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsMarkedAsSpamTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsMarkedAsSpamTest.java
@@ -29,7 +29,7 @@ import org.apache.mailet.base.test.FakeMail;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class IsMarkedAsSpamTest {
+class IsMarkedAsSpamTest {
private IsMarkedAsSpam matcher;
@BeforeEach
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java
index b9528fb..64166b1 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java
@@ -41,7 +41,7 @@ import org.apache.mailet.base.test.FakeMatcherConfig;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class IsOverQuotaTest {
+class IsOverQuotaTest {
private IsOverQuota testee;
private InMemoryPerUserMaxQuotaManager maxQuotaManager;
private DefaultUserQuotaRootResolver quotaRootResolver;
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsRemoteDeliveryPermanentErrorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsRemoteDeliveryPermanentErrorTest.java
index 5c35156..e4f40e1 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsRemoteDeliveryPermanentErrorTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsRemoteDeliveryPermanentErrorTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-public class IsRemoteDeliveryPermanentErrorTest {
+class IsRemoteDeliveryPermanentErrorTest {
private IsRemoteDeliveryPermanentError testee;
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsRemoteDeliveryTemporaryErrorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsRemoteDeliveryTemporaryErrorTest.java
index 4a078d9..48870f5 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsRemoteDeliveryTemporaryErrorTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsRemoteDeliveryTemporaryErrorTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-public class IsRemoteDeliveryTemporaryErrorTest {
+class IsRemoteDeliveryTemporaryErrorTest {
private IsRemoteDeliveryTemporaryError testee;
private Mail createMail() throws MessagingException {
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
index 8503be4..7b392aa 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
@@ -32,7 +32,7 @@ import org.apache.mailet.base.test.FakeMatcherConfig;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class RemoteAddrInNetworkTest {
+class RemoteAddrInNetworkTest {
private RemoteAddrInNetwork matcher;
private FakeMail fakeMail;
private MailAddress testRecipient;
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteDeliveryFailedWithSMTPCodeTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteDeliveryFailedWithSMTPCodeTest.java
index 95fea28..04f6aea 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteDeliveryFailedWithSMTPCodeTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteDeliveryFailedWithSMTPCodeTest.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
-public class RemoteDeliveryFailedWithSMTPCodeTest {
+class RemoteDeliveryFailedWithSMTPCodeTest {
private static final String CONDITION = "521";
public static final int SMTP_ERROR_CODE_521 = 521;
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java
index 7dab9f3..501591f 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
-public class MailAddressUtilsTest {
+class MailAddressUtilsTest {
@Test
void fromShouldThrowWhenInternetAddressesIsNull() {
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java
index d9c2b05..87c4fac 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java
@@ -43,7 +43,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
-public class SpecialAddressesUtilsTest {
+class SpecialAddressesUtilsTest {
private MailAddress postmaster;
private SpecialAddressesUtils testee;
diff --git a/server/mailet/rate-limiter-redis/src/test/java/org/apache/james/rate/limiter/RedisExtensionTest.java b/server/mailet/rate-limiter-redis/src/test/java/org/apache/james/rate/limiter/RedisExtensionTest.java
index 99fe806..8f67c1c 100644
--- a/server/mailet/rate-limiter-redis/src/test/java/org/apache/james/rate/limiter/RedisExtensionTest.java
+++ b/server/mailet/rate-limiter-redis/src/test/java/org/apache/james/rate/limiter/RedisExtensionTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import io.lettuce.core.api.sync.RedisCommands;
-public class RedisExtensionTest {
+class RedisExtensionTest {
@RegisterExtension
static RedisExtension redisExtension = new RedisExtension();
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 02/05: [SONAR] Run inspections for Backend projects
Posted by bt...@apache.org.
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 a27737eab3886c597dacb20855193407380dd7cd
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Feb 20 13:19:07 2022 +0700
[SONAR] Run inspections for Backend projects
---
.../backends/cassandra/init/ClusterFactory.java | 4 ++--
.../CassandraConsistenciesConfiguration.java | 3 ++-
.../init/configuration/ClusterConfiguration.java | 2 --
.../init/configuration/KeyspaceConfiguration.java | 5 ----
.../configuration/QueryLoggerConfiguration.java | 8 +++----
.../versions/CassandraSchemaVersionDAOTest.java | 4 +---
.../backends/es/v7/DeleteByQueryPerformer.java | 3 ---
.../james/backends/rabbitmq/QueueArguments.java | 2 +-
.../backends/rabbitmq/RabbitMQConfiguration.java | 28 +++++++++++-----------
.../backends/rabbitmq/RabbitMQManagementAPI.java | 4 ++--
10 files changed, 25 insertions(+), 38 deletions(-)
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterFactory.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterFactory.java
index 3f0cb20..9a0f254 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterFactory.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterFactory.java
@@ -63,8 +63,8 @@ public class ClusterFactory {
Cluster cluster = clusterBuilder.build();
try {
- configuration.getQueryLoggerConfiguration().map(queryLoggerConfiguration ->
- cluster.register(queryLoggerConfiguration.getQueryLogger()));
+ configuration.getQueryLoggerConfiguration()
+ .ifPresent(queryLoggerConfiguration -> cluster.register(queryLoggerConfiguration.getQueryLogger()));
ensureContactable(cluster);
return cluster;
} catch (Exception e) {
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/CassandraConsistenciesConfiguration.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/CassandraConsistenciesConfiguration.java
index a65620c..8c74cc1 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/CassandraConsistenciesConfiguration.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/CassandraConsistenciesConfiguration.java
@@ -55,8 +55,9 @@ public class CassandraConsistenciesConfiguration {
return ConsistencyLevel.SERIAL;
case "LOCAL_SERIAL":
return ConsistencyLevel.LOCAL_SERIAL;
+ default:
+ throw new IllegalArgumentException("'" + value + "' is not a value ConsistencyLevel");
}
- throw new IllegalArgumentException("'" + value + "' is not a value ConsistencyLevel");
}
public static CassandraConsistenciesConfiguration fromConfiguration(CassandraConfiguration configuration) {
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
index 265fbb4..a39d376 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/ClusterConfiguration.java
@@ -206,8 +206,6 @@ public class ClusterConfiguration {
private static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 5000;
public static final int DEFAULT_CASSANDRA_PORT = 9042;
- private static final boolean DEFAULT_SSL = false;
-
public static Builder builder() {
return new Builder();
}
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/KeyspaceConfiguration.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/KeyspaceConfiguration.java
index 3464336..62689a3 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/KeyspaceConfiguration.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/KeyspaceConfiguration.java
@@ -46,11 +46,6 @@ public class KeyspaceConfiguration {
}
}
- private static final String DEFAULT_KEYSPACE = "apache_james";
- private static final int DEFAULT_REPLICATION_FACTOR = 1;
-
- private static final boolean DEFAULT_SSL = false;
-
public static Builder.RequireKeyspace builder() {
return name -> replicationFactor -> durableWrites -> new KeyspaceConfiguration(name, replicationFactor, durableWrites);
}
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/QueryLoggerConfiguration.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/QueryLoggerConfiguration.java
index 4478316..ee1f504 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/QueryLoggerConfiguration.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/configuration/QueryLoggerConfiguration.java
@@ -174,11 +174,9 @@ public class QueryLoggerConfiguration {
public QueryLogger getQueryLogger() {
QueryLogger.Builder builder = QueryLogger.builder();
- percentileTracker.map(percentileTracker ->
- slowQueryLatencyThresholdPercentile.map(slowQueryLatencyThresholdPercentile ->
- builder.withDynamicThreshold(percentileTracker, slowQueryLatencyThresholdPercentile)
- )
- );
+ percentileTracker.ifPresent(percentileTracker ->
+ slowQueryLatencyThresholdPercentile.ifPresent(slowQueryLatencyThresholdPercentile ->
+ builder.withDynamicThreshold(percentileTracker, slowQueryLatencyThresholdPercentile)));
constantThreshold.ifPresent(builder::withConstantThreshold);
constantThreshold.ifPresent(builder::withConstantThreshold);
diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java
index edf7206..646c634 100644
--- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java
+++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAOTest.java
@@ -21,8 +21,6 @@ package org.apache.james.backends.cassandra.versions;
import static org.assertj.core.api.Assertions.assertThat;
-import java.util.Optional;
-
import org.apache.james.backends.cassandra.CassandraCluster;
import org.apache.james.backends.cassandra.CassandraClusterExtension;
import org.junit.jupiter.api.BeforeEach;
@@ -43,7 +41,7 @@ class CassandraSchemaVersionDAOTest {
@Test
void getCurrentSchemaVersionShouldReturnEmptyWhenTableIsEmpty() {
assertThat(testee.getCurrentSchemaVersion().block())
- .isEqualTo(Optional.empty());
+ .isEmpty();
}
@Test
diff --git a/backends-common/elasticsearch-v7/src/main/java/org/apache/james/backends/es/v7/DeleteByQueryPerformer.java b/backends-common/elasticsearch-v7/src/main/java/org/apache/james/backends/es/v7/DeleteByQueryPerformer.java
index dafec26..448c71b 100644
--- a/backends-common/elasticsearch-v7/src/main/java/org/apache/james/backends/es/v7/DeleteByQueryPerformer.java
+++ b/backends-common/elasticsearch-v7/src/main/java/org/apache/james/backends/es/v7/DeleteByQueryPerformer.java
@@ -23,8 +23,6 @@ import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.reindex.DeleteByQueryRequest;
-import com.google.common.annotations.VisibleForTesting;
-
import reactor.core.publisher.Mono;
public class DeleteByQueryPerformer {
@@ -32,7 +30,6 @@ public class DeleteByQueryPerformer {
private final ReactorElasticSearchClient client;
private final WriteAliasName aliasName;
- @VisibleForTesting
DeleteByQueryPerformer(ReactorElasticSearchClient client, WriteAliasName aliasName) {
this.client = client;
this.aliasName = aliasName;
diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/QueueArguments.java b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/QueueArguments.java
index ae2a958..2dd1c7c 100644
--- a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/QueueArguments.java
+++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/QueueArguments.java
@@ -40,7 +40,7 @@ public class QueueArguments {
}
}
- public static ImmutableMap<String, Object> NO_ARGUMENTS = ImmutableMap.of();
+ public static final ImmutableMap<String, Object> NO_ARGUMENTS = ImmutableMap.of();
public static Builder builder() {
return new Builder();
diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConfiguration.java b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConfiguration.java
index 94c500c..48588d4 100644
--- a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConfiguration.java
+++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConfiguration.java
@@ -290,20 +290,20 @@ public class RabbitMQConfiguration {
}
}
- private static String USE_SSL = "ssl.enabled";
- private static String HOSTS = "hosts";
- private static String USE_QUORUM_QUEUES = "quorum.queues.enable";
- private static String QUORUM_QUEUES_REPLICATION_FACTOR = "quorum.queues.replication.factor";
- private static String USE_SSL_MANAGEMENT = "ssl.management.enabled";
-
- private static String SSL_TRUST_STORE_PATH = "ssl.truststore";
- private static String SSL_TRUST_STORE_PASSWORD = "ssl.truststore.password";
- private static String SSL_VALIDATION_STRATEGY = "ssl.validation.strategy";
- private static String SSL_HOSTNAME_VERIFIER = "ssl.hostname.verifier";
-
- private static String SSL_KEY_STORE_PATH = "ssl.keystore";
- private static String SSL_KEY_STORE_PASSWORD = "ssl.keystore.password";
- private static String QUEUE_TTL = "notification.queue.ttl";
+ private static final String USE_SSL = "ssl.enabled";
+ private static final String HOSTS = "hosts";
+ private static final String USE_QUORUM_QUEUES = "quorum.queues.enable";
+ private static final String QUORUM_QUEUES_REPLICATION_FACTOR = "quorum.queues.replication.factor";
+ private static final String USE_SSL_MANAGEMENT = "ssl.management.enabled";
+
+ private static final String SSL_TRUST_STORE_PATH = "ssl.truststore";
+ private static final String SSL_TRUST_STORE_PASSWORD = "ssl.truststore.password";
+ private static final String SSL_VALIDATION_STRATEGY = "ssl.validation.strategy";
+ private static final String SSL_HOSTNAME_VERIFIER = "ssl.hostname.verifier";
+
+ private static final String SSL_KEY_STORE_PATH = "ssl.keystore";
+ private static final String SSL_KEY_STORE_PASSWORD = "ssl.keystore.password";
+ private static final String QUEUE_TTL = "notification.queue.ttl";
public static class ManagementCredentials {
diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java
index 65f49dc..5661a4d 100644
--- a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java
+++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQManagementAPI.java
@@ -393,13 +393,13 @@ public interface RabbitMQManagementAPI {
.getSslConfiguration()
.getStrategy();
- final TrustStrategy TRUST_ALL = (x509Certificates, authType) -> true;
+ final TrustStrategy trustAll = (x509Certificates, authType) -> true;
switch (strategy) {
case DEFAULT:
break;
case IGNORE:
- sslContextBuilder.loadTrustMaterial(TRUST_ALL);
+ sslContextBuilder.loadTrustMaterial(trustAll);
break;
case OVERRIDE:
applyTrustStore(sslContextBuilder, configuration);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 05/05: [SONAR] Solve some minor warnings in server/data projects
Posted by bt...@apache.org.
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 a39fe45b6fcadf8a6b03f68f5f1f0752269045ea
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Feb 21 15:24:33 2022 +0700
[SONAR] Solve some minor warnings in server/data projects
---
.../org/apache/james/jmap/cassandra/upload/UploadConfiguration.java | 2 +-
.../java/org/apache/james/domainlist/lib/DomainListConfiguration.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/upload/UploadConfiguration.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/upload/UploadConfiguration.java
index 675715d..f54d24d 100644
--- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/upload/UploadConfiguration.java
+++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/upload/UploadConfiguration.java
@@ -25,7 +25,7 @@ import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class UploadConfiguration {
- public static UploadConfiguration SINGLETON = new UploadConfiguration(Duration.ofDays(7));
+ public static final UploadConfiguration SINGLETON = new UploadConfiguration(Duration.ofDays(7));
private final Duration uploadTtlDuration;
diff --git a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListConfiguration.java b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListConfiguration.java
index 3983a0d..90e0500 100644
--- a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListConfiguration.java
+++ b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListConfiguration.java
@@ -129,7 +129,7 @@ public class DomainListConfiguration {
}
public static final Duration DEFAULT_EXPIRACY = Duration.ofSeconds(10);
- public static DomainListConfiguration DEFAULT = builder().build();
+ public static final DomainListConfiguration DEFAULT = builder().build();
public static final String CONFIGURE_AUTODETECT = "autodetect";
public static final String CONFIGURE_AUTODETECT_IP = "autodetectIP";
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org