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 67e384d3d2e82e8a7cf89be7f9ed495564aa81d2 Author: Raphael Ouazana <[email protected]> AuthorDate: Mon Jul 29 15:27:54 2019 +0200 Fix Checkstyle and Eclipse warnings --- .../java/org/apache/james/backends/cassandra/CassandraCluster.java | 2 +- .../org/apache/james/backends/cassandra/CassandraClusterTest.java | 2 +- .../backends/cassandra/migration/CassandraMigrationServiceTest.java | 1 - .../mailbox/cassandra/mail/migration/AttachmentV2MigrationTest.java | 1 - .../main/java/org/apache/james/vault/dto/query/QueryTranslator.java | 6 +++++- .../vault/utils/VaultGarbageCollectionTaskSerializationTest.java | 2 +- .../org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java | 1 - .../james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java | 2 +- .../james/webadmin/vault/routes/DeletedMessagesVaultExportTask.java | 2 +- .../webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java | 2 +- .../org/apache/james/server/task/json/TaskSerializationTest.java | 6 +++--- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java index 1517e00..6c95990 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraCluster.java @@ -49,7 +49,7 @@ public final class CassandraCluster implements AutoCloseable { } private static void assertClusterNotRunning() { - startStackTrace.ifPresent( e -> { + startStackTrace.ifPresent(e -> { throw new IllegalStateException("Cluster already running, look at the cause for the initial connection creation call trace", e); }); } diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraClusterTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraClusterTest.java index 6046770..acccefc 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraClusterTest.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/CassandraClusterTest.java @@ -61,7 +61,7 @@ class CassandraClusterTest { connection.close(); assertThatCode(() -> { try (CassandraCluster cluster = createCluster()) { - + // Trigger autoclose } }).doesNotThrowAnyException(); } diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/CassandraMigrationServiceTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/CassandraMigrationServiceTest.java index 0410313..d99ca30 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/CassandraMigrationServiceTest.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/migration/CassandraMigrationServiceTest.java @@ -29,7 +29,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import java.util.Map; import java.util.Optional; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentV2MigrationTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentV2MigrationTest.java index 2100a37..ffcf48a 100644 --- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentV2MigrationTest.java +++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/migration/AttachmentV2MigrationTest.java @@ -31,7 +31,6 @@ import org.apache.james.backends.cassandra.CassandraClusterExtension; import org.apache.james.backends.cassandra.CassandraRestartExtension; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration; -import org.apache.james.backends.cassandra.migration.Migration; import org.apache.james.blob.api.BucketName; import org.apache.james.blob.api.HashBlobId; import org.apache.james.blob.cassandra.CassandraBlobModule; diff --git a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryTranslator.java b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryTranslator.java index 0467343..cfc9c26 100644 --- a/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryTranslator.java +++ b/mailbox/plugin/deleted-messages-vault/src/main/java/org/apache/james/vault/dto/query/QueryTranslator.java @@ -117,6 +117,7 @@ public class QueryTranslator { FieldValueSerializer<Boolean> BOOLEAN_SERIALIZER = Object::toString; FieldValueSerializer<MailAddress> MAIL_ADDRESS_SERIALIZER = MailAddress::asString; + @SuppressWarnings("rawtypes") static Optional<FieldValueSerializer> getSerializerForValue(Object value) { if (value instanceof MailboxId) { return Optional.of(MAILBOX_ID_SERIALIZER); @@ -205,12 +206,15 @@ public class QueryTranslator { Operator operator = criterion.getValueMatcher().operator(); Object value = criterion.getValueMatcher().expectedValue(); + @SuppressWarnings("rawtypes") FieldValueSerializer fieldValueSerializer = FieldValueSerializer.getSerializerForValue(value).orElseThrow( () -> new IllegalArgumentException("Value of type " + value.getClass().getSimpleName() + "' is not handled by the combinaison of operator : " + operator.name() + " and field :" + fieldName.name())); - return new CriterionDTO(fieldName.getValue(), operator.getValue(), fieldValueSerializer.serialize(value)); + @SuppressWarnings("unchecked") + CriterionDTO result = new CriterionDTO(fieldName.getValue(), operator.getValue(), fieldValueSerializer.serialize(value)); + return result; } Query translate(QueryDTO queryDTO) throws QueryTranslatorException { diff --git a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/utils/VaultGarbageCollectionTaskSerializationTest.java b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/utils/VaultGarbageCollectionTaskSerializationTest.java index 60c8cb9..07d5b89 100644 --- a/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/utils/VaultGarbageCollectionTaskSerializationTest.java +++ b/mailbox/plugin/deleted-messages-vault/src/test/java/org/apache/james/vault/utils/VaultGarbageCollectionTaskSerializationTest.java @@ -46,7 +46,7 @@ class VaultGarbageCollectionTaskSerializationTest { taskSerializer = new JsonTaskSerializer(moduleVaultGarbageCollection()); } - private TaskDTOModule moduleVaultGarbageCollection() { + private TaskDTOModule<VaultGarbageCollectionTask, VaultGarbageCollectionTask.VaultGarbageCollectionTaskDTO> moduleVaultGarbageCollection() { VaultGarbageCollectionTask.Factory factory = new VaultGarbageCollectionTask.Factory(vault); return TaskDTOModule .forTask(VaultGarbageCollectionTask.class) diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java index debbecd..2f4b58b 100644 --- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java +++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java @@ -29,7 +29,6 @@ import org.apache.james.imap.encode.main.DefaultImapEncoderFactory; import org.apache.james.imap.main.DefaultImapDecoderFactory; import org.apache.james.imap.processor.main.DefaultImapProcessorFactory; import org.apache.james.mailbox.MailboxManager; -import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.SubscriptionManager; import org.apache.james.mailbox.acl.GroupMembershipResolver; import org.apache.james.mailbox.acl.MailboxACLResolver; diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java index 9672878..1af3326 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultDeleteTask.java @@ -40,7 +40,7 @@ public class DeletedMessagesVaultDeleteTask implements Task { static final String TYPE = "deletedMessages/delete"; - public static final Function<DeletedMessagesVaultDeleteTask.Factory, TaskDTOModule> MODULE = (factory) -> + public static final Function<DeletedMessagesVaultDeleteTask.Factory, TaskDTOModule<DeletedMessagesVaultDeleteTask, DeletedMessagesVaultDeleteTaskDTO>> MODULE = (factory) -> DTOModule .forDomainObject(DeletedMessagesVaultDeleteTask.class) .convertToDTO(DeletedMessagesVaultDeleteTask.DeletedMessagesVaultDeleteTaskDTO.class) 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 26092eb..9b65c20 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 @@ -47,7 +47,7 @@ class DeletedMessagesVaultExportTask implements Task { static final String TYPE = "deletedMessages/export"; - public static final Function<DeletedMessagesVaultExportTask.Factory, TaskDTOModule> MODULE = (factory) -> + public static final Function<DeletedMessagesVaultExportTask.Factory, TaskDTOModule<DeletedMessagesVaultExportTask, DeletedMessagesVaultExportTaskDTO>> MODULE = (factory) -> DTOModule .forDomainObject(DeletedMessagesVaultExportTask.class) .convertToDTO(DeletedMessagesVaultExportTask.DeletedMessagesVaultExportTaskDTO.class) diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java index 0bae69e..786a73b 100644 --- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java +++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/main/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRestoreTask.java @@ -47,7 +47,7 @@ class DeletedMessagesVaultRestoreTask implements Task { static final String TYPE = "deletedMessages/restore"; - public static final Function<DeletedMessagesVaultRestoreTask.Factory, TaskDTOModule> MODULE = (factory) -> + public static final Function<DeletedMessagesVaultRestoreTask.Factory, TaskDTOModule<DeletedMessagesVaultRestoreTask, DeletedMessagesVaultRestoreTaskDTO>> MODULE = (factory) -> DTOModule .forDomainObject(DeletedMessagesVaultRestoreTask.class) .convertToDTO(DeletedMessagesVaultRestoreTask.DeletedMessagesVaultRestoreTaskDTO.class) diff --git a/server/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializationTest.java b/server/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializationTest.java index 103e6e9..b33b953 100644 --- a/server/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializationTest.java +++ b/server/task-json/src/test/java/org/apache/james/server/task/json/TaskSerializationTest.java @@ -38,7 +38,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; class TaskSerializationTest { private static final String SERIALIZED_FAILED_TASK = "{\"type\": \"failed-task\"}"; - private TaskDTOModule failedTaskModule = DTOModule + private TaskDTOModule<FailedTask, FailedTaskDTO> failedTaskModule = DTOModule .forDomainObject(FailedTask.class) .convertToDTO(FailedTaskDTO.class) .toDomainObjectConverter(dto -> new FailedTask()) @@ -47,7 +47,7 @@ class TaskSerializationTest { .withFactory(TaskDTOModule::new); private static final String SERIALIZED_COMPLETED_TASK = "{\"type\": \"completed-task\"}"; - private TaskDTOModule completedTaskModule = DTOModule + private TaskDTOModule<CompletedTask, CompletedTaskDTO> completedTaskModule = DTOModule .forDomainObject(CompletedTask.class) .convertToDTO(CompletedTaskDTO.class) .toDomainObjectConverter(dto -> new CompletedTask()) @@ -56,7 +56,7 @@ class TaskSerializationTest { .withFactory(TaskDTOModule::new); private static final String SERIALIZED_THROWING_TASK = "{\"type\": \"throwing-task\"}"; - private TaskDTOModule throwingTaskModule = DTOModule + private TaskDTOModule<ThrowingTask, ThrowingTaskDTO> throwingTaskModule = DTOModule .forDomainObject(ThrowingTask.class) .convertToDTO(ThrowingTaskDTO.class) .toDomainObjectConverter(dto -> new ThrowingTask()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
