This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 88d646fda76563540239c562288d54b4fe562378 Author: Rene Cordier <[email protected]> AuthorDate: Mon Feb 3 17:17:46 2020 +0700 JAMES-3033 Update imports policy with checkstyle With the update of the checkstyle dependency, it seems stricter on the imports and thus needed to refactor a bit of code regarding that. The pattern for imports in place here is as follows: ``` import statics; [BLANK_LINE] import java.*; [BLANK_LINE] import javax.*; [BLANK_LINE] import org.*; [BLANK_LINE] import com.*; [BLANK_LINE] import the rest; ``` --- .../james/backends/cassandra/init/CassandraTableManager.java | 1 + .../cassandra/init/SessionWithInitializedTablesFactory.java | 1 + .../james/backends/cassandra/migration/MigrationTask.java | 1 + .../james/backends/cassandra/utils/CassandraAsyncExecutor.java | 1 + .../apache/james/backends/cassandra/utils/CassandraUtils.java | 1 + .../backends/cassandra/versions/CassandraSchemaVersionDAO.java | 1 + .../james/backends/rabbitmq/RabbitMQConnectionFactory.java | 1 + .../apache/james/backends/rabbitmq/RabbitMQManagementAPI.java | 1 + .../apache/james/backends/rabbitmq/SimpleConnectionPool.java | 1 + checkstyle.xml | 10 ++++++---- .../java/org/apache/james/mailbox/ApplicableFlagBuilder.java | 1 + .../src/main/java/org/apache/james/mailbox/FlagsBuilder.java | 1 + .../mailbox/cassandra/mail/CassandraApplicableFlagDAO.java | 1 + .../james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java | 1 + .../cassandra/mail/CassandraAttachmentMessageIdDAO.java | 1 + .../mailbox/cassandra/mail/CassandraAttachmentOwnerDAO.java | 1 + .../mailbox/cassandra/mail/CassandraDeletedMessageDAO.java | 1 + .../james/mailbox/cassandra/mail/CassandraFirstUnseenDAO.java | 1 + .../mailbox/cassandra/mail/CassandraIndexTableHandler.java | 1 + .../mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java | 1 + .../mailbox/cassandra/mail/CassandraUserMailboxRightsDAO.java | 1 + .../java/org/apache/james/mailbox/events/InVMEventBus.java | 1 + .../james/mailbox/events/delivery/InVmEventDelivery.java | 1 + .../org/apache/james/mailbox/events/WaitDelayGenerator.java | 1 + .../org/apache/james/mailbox/store/StoreAttachmentManager.java | 1 - mailet/api/src/main/java/org/apache/mailet/Matcher.java | 1 + .../java/org/apache/james/transport/mailets/AddFooter.java | 1 + .../org/apache/james/transport/mailets/ContentReplacer.java | 1 + .../org/apache/james/transport/mailets/MimeDecodingMailet.java | 1 + .../java/org/apache/james/transport/mailets/ToProcessor.java | 1 + .../src/main/java/org/apache/james/CleanupTasksPerformer.java | 1 + .../org/apache/james/modules/protocols/SieveProbeImpl.java | 1 + .../apache/james/util/concurrency/ConcurrentTestRunner.java | 1 + .../org/apache/james/mailrepository/cassandra/UrlsDao.java | 1 + .../apache/james/sieve/cassandra/CassandraActiveScriptDAO.java | 1 + .../org/apache/james/sieve/cassandra/CassandraSieveDAO.java | 1 + .../apache/james/sieve/cassandra/CassandraSieveQuotaDAO.java | 1 + .../jmap/cassandra/vacation/CassandraNotificationRegistry.java | 1 + .../cassandra/vacation/CassandraNotificationRegistryDAO.java | 1 + .../james/jmap/cassandra/vacation/CassandraVacationDAO.java | 1 + .../jmap/cassandra/vacation/CassandraVacationRepository.java | 1 + .../james/jmap/memory/vacation/MemoryNotificationRegistry.java | 1 + .../james/jmap/memory/vacation/MemoryVacationRepository.java | 1 + .../james/transport/mailets/delivery/MailDispatcher.java | 1 + .../james/transport/mailets/redirect/AddressExtractor.java | 1 + .../mailets/remote/delivery/EnhancedMessagingException.java | 1 + .../transport/mailets/remote/delivery/MessageComposer.java | 1 + .../james/transport/matchers/AbstractPriorityMatcher.java | 1 + .../cassandra/CassandraMailRepositoryCountDAO.java | 1 + .../cassandra/CassandraMailRepositoryKeysDAO.java | 1 + .../cassandra/CassandraMailRepositoryMailDAO.java | 1 + .../cassandra/MergingCassandraMailRepositoryMailDao.java | 1 + .../service/CassandraMappingsSolveInconsistenciesTask.java | 1 + .../java/org/apache/james/webadmin/utils/JsonTransformer.java | 1 + .../src/main/java/org/apache/james/queue/jms/JMSMailQueue.java | 1 + .../org/apache/james/queue/memory/MemoryMailQueueFactory.java | 1 + .../org/apache/james/queue/rabbitmq/RabbitMQMailQueue.java | 1 + .../james/queue/rabbitmq/view/cassandra/BrowseStartDAO.java | 1 + .../james/queue/rabbitmq/view/cassandra/EnqueuedMailsDAO.java | 1 + .../src/main/java/org/apache/james/task/MemoryTaskManager.java | 1 + .../java/org/apache/james/task/SerialTaskManagerWorker.java | 1 + 61 files changed, 65 insertions(+), 5 deletions(-) diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java index 30980f3..ee0e2c4 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/CassandraTableManager.java @@ -29,6 +29,7 @@ import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; import com.datastax.driver.core.KeyspaceMetadata; import com.datastax.driver.core.Session; import com.datastax.driver.core.querybuilder.QueryBuilder; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/SessionWithInitializedTablesFactory.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/SessionWithInitializedTablesFactory.java index 8448a32..89bcf0d 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/SessionWithInitializedTablesFactory.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/SessionWithInitializedTablesFactory.java @@ -20,6 +20,7 @@ package org.apache.james.backends.cassandra.init; import java.util.stream.Stream; + import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Provider; diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java index 47ea068..e8a882a 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/migration/MigrationTask.java @@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory; import com.github.fge.lambdas.Throwing; import com.google.common.annotations.VisibleForTesting; + import reactor.util.function.Tuple2; import reactor.util.function.Tuples; diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java index 3654ebe..8b911dd 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraAsyncExecutor.java @@ -27,6 +27,7 @@ import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.datastax.driver.core.Statement; + import net.javacrumbs.futureconverter.java8guava.FutureConverter; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraUtils.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraUtils.java index 6732966..e6ec3a9 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraUtils.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/utils/CassandraUtils.java @@ -28,6 +28,7 @@ import org.apache.james.backends.cassandra.init.configuration.CassandraConfigura import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Row; + import reactor.core.publisher.Flux; public class CassandraUtils { diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAO.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAO.java index 6d958a7..4925f31 100644 --- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAO.java +++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/versions/CassandraSchemaVersionDAO.java @@ -36,6 +36,7 @@ import org.apache.james.backends.cassandra.versions.table.CassandraSchemaVersion import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; import com.datastax.driver.core.utils.UUIDs; + import reactor.core.publisher.Mono; public class CassandraSchemaVersionDAO { diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConnectionFactory.java b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConnectionFactory.java index 1f4d0fd..7d3c569 100644 --- a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConnectionFactory.java +++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/RabbitMQConnectionFactory.java @@ -24,6 +24,7 @@ import javax.inject.Inject; import com.rabbitmq.client.Connection; import com.rabbitmq.client.ConnectionFactory; + import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; 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 17983c0..e6b94d0 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 @@ -27,6 +27,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.base.MoreObjects; + import feign.Feign; import feign.Logger; import feign.Param; diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/SimpleConnectionPool.java b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/SimpleConnectionPool.java index 4ffebfd..0354002 100644 --- a/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/SimpleConnectionPool.java +++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backends/rabbitmq/SimpleConnectionPool.java @@ -30,6 +30,7 @@ import javax.inject.Inject; import com.github.fge.lambdas.Throwing; import com.google.common.annotations.VisibleForTesting; import com.rabbitmq.client.Connection; + import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; diff --git a/checkstyle.xml b/checkstyle.xml index c445617..91909e2 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -172,10 +172,12 @@ <property name="severity" value="ignore"/> <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/> </module> - <module name="CustomImportOrder"> - <property name="customImportOrderRules" value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS"/> - <property name="specialImportsRegExp" value="org"/> - <property name="sortImportsInGroupAlphabetically" value="true"/> + <module name="ImportOrder"> + <property name="groups" value="/^java\./,javax,org,com"/> + <property name="ordered" value="true"/> + <property name="separated" value="true"/> + <property name="option" value="top"/> + <property name="sortStaticImportsAlphabetically" value="true"/> </module> <module name="UnusedImports"/> <module name="MethodParamPad"/> diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/ApplicableFlagBuilder.java b/mailbox/api/src/main/java/org/apache/james/mailbox/ApplicableFlagBuilder.java index b157309..4190f78 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/ApplicableFlagBuilder.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/ApplicableFlagBuilder.java @@ -19,6 +19,7 @@ package org.apache.james.mailbox; import java.util.List; + import javax.mail.Flags; import com.google.common.annotations.VisibleForTesting; diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/FlagsBuilder.java b/mailbox/api/src/main/java/org/apache/james/mailbox/FlagsBuilder.java index 7a791ec..81f41fd 100644 --- a/mailbox/api/src/main/java/org/apache/james/mailbox/FlagsBuilder.java +++ b/mailbox/api/src/main/java/org/apache/james/mailbox/FlagsBuilder.java @@ -21,6 +21,7 @@ package org.apache.james.mailbox; import java.util.Arrays; import java.util.List; + import javax.mail.Flags; public class FlagsBuilder { diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAO.java index 952ef7f..cd7398d 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraApplicableFlagDAO.java @@ -41,6 +41,7 @@ import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; import com.datastax.driver.core.querybuilder.Update; import com.datastax.driver.core.querybuilder.Update.Assignments; + import reactor.core.publisher.Mono; public class CassandraApplicableFlagDAO { diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java index f0871bf..a044e1f 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentDAOV2.java @@ -44,6 +44,7 @@ import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.google.common.base.Preconditions; + import reactor.core.publisher.Mono; public class CassandraAttachmentDAOV2 { diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMessageIdDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMessageIdDAO.java index 46d664c..8488472 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMessageIdDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMessageIdDAO.java @@ -39,6 +39,7 @@ import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.google.common.base.Preconditions; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAO.java index 8e94a2b..c3e9d2c 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentOwnerDAO.java @@ -37,6 +37,7 @@ import org.apache.james.mailbox.model.AttachmentId; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java index 0ab4085..cfdebae 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraDeletedMessageDAO.java @@ -42,6 +42,7 @@ import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.ResultSet; import com.datastax.driver.core.Session; import com.google.common.annotations.VisibleForTesting; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAO.java index be0cdc3..94fc03b 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraFirstUnseenDAO.java @@ -37,6 +37,7 @@ import org.apache.james.mailbox.cassandra.ids.CassandraId; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; + import reactor.core.publisher.Mono; public class CassandraFirstUnseenDAO { diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandler.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandler.java index 6ca3f46..84516fa 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandler.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraIndexTableHandler.java @@ -29,6 +29,7 @@ import org.apache.james.mailbox.model.UpdatedFlags; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import com.google.common.collect.ImmutableSet; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java index 802e423..3d91975 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxRecentsDAO.java @@ -37,6 +37,7 @@ import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; import com.google.common.annotations.VisibleForTesting; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAO.java index 035fd9e..127b5be 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraUserMailboxRightsDAO.java @@ -48,6 +48,7 @@ import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.datastax.driver.core.querybuilder.QueryBuilder; import com.github.fge.lambdas.Throwing; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/mailbox/event/event-memory/src/main/java/org/apache/james/mailbox/events/InVMEventBus.java b/mailbox/event/event-memory/src/main/java/org/apache/james/mailbox/events/InVMEventBus.java index bcd2376..50ebcf6 100644 --- a/mailbox/event/event-memory/src/main/java/org/apache/james/mailbox/events/InVMEventBus.java +++ b/mailbox/event/event-memory/src/main/java/org/apache/james/mailbox/events/InVMEventBus.java @@ -34,6 +34,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; diff --git a/mailbox/event/event-memory/src/main/java/org/apache/james/mailbox/events/delivery/InVmEventDelivery.java b/mailbox/event/event-memory/src/main/java/org/apache/james/mailbox/events/delivery/InVmEventDelivery.java index a36119f..17f2f52 100644 --- a/mailbox/event/event-memory/src/main/java/org/apache/james/mailbox/events/delivery/InVmEventDelivery.java +++ b/mailbox/event/event-memory/src/main/java/org/apache/james/mailbox/events/delivery/InVmEventDelivery.java @@ -37,6 +37,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; + import reactor.core.publisher.Mono; public class InVmEventDelivery implements EventDelivery { diff --git a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/WaitDelayGenerator.java b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/WaitDelayGenerator.java index 33a3586..9f2c0fd 100644 --- a/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/WaitDelayGenerator.java +++ b/mailbox/event/event-rabbitmq/src/main/java/org/apache/james/mailbox/events/WaitDelayGenerator.java @@ -25,6 +25,7 @@ import java.time.Duration; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; + import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreAttachmentManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreAttachmentManager.java index 0ac9959..2c59619 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreAttachmentManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreAttachmentManager.java @@ -34,7 +34,6 @@ import org.apache.james.mailbox.model.Attachment; import org.apache.james.mailbox.model.AttachmentId; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.store.mail.AttachmentMapperFactory; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mailet/api/src/main/java/org/apache/mailet/Matcher.java b/mailet/api/src/main/java/org/apache/mailet/Matcher.java index 3d71072..ad4b529 100644 --- a/mailet/api/src/main/java/org/apache/mailet/Matcher.java +++ b/mailet/api/src/main/java/org/apache/mailet/Matcher.java @@ -21,6 +21,7 @@ package org.apache.mailet; import java.util.Collection; + import javax.mail.MessagingException; import org.apache.james.core.MailAddress; diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java index 223f156..44ef5c7 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/AddFooter.java @@ -26,6 +26,7 @@ import java.io.UnsupportedEncodingException; import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.mail.MessagingException; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java index 789bc92..725df64 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ContentReplacer.java @@ -24,6 +24,7 @@ import java.nio.charset.Charset; import java.util.List; import java.util.Optional; import java.util.regex.Matcher; + import javax.mail.MessagingException; import javax.mail.internet.ContentType; import javax.mail.internet.ParseException; diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java index 1dc3a30..7b35e95 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/MimeDecodingMailet.java @@ -24,6 +24,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; import java.util.stream.Stream; + import javax.mail.MessagingException; import javax.mail.internet.MimeBodyPart; diff --git a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java index c0860b2..8e2fad5 100644 --- a/mailet/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java +++ b/mailet/standard/src/main/java/org/apache/james/transport/mailets/ToProcessor.java @@ -22,6 +22,7 @@ package org.apache.james.transport.mailets; import java.util.Optional; + import javax.mail.MessagingException; import org.apache.mailet.Mail; diff --git a/server/container/guice/guice-common/src/main/java/org/apache/james/CleanupTasksPerformer.java b/server/container/guice/guice-common/src/main/java/org/apache/james/CleanupTasksPerformer.java index 55895f9..34c5a3c 100644 --- a/server/container/guice/guice-common/src/main/java/org/apache/james/CleanupTasksPerformer.java +++ b/server/container/guice/guice-common/src/main/java/org/apache/james/CleanupTasksPerformer.java @@ -29,6 +29,7 @@ import org.apache.james.task.TaskType; import org.apache.james.util.Runnables; import com.github.fge.lambdas.Throwing; + import reactor.core.publisher.Flux; public class CleanupTasksPerformer { diff --git a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java index 9a46442..6713690 100644 --- a/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java +++ b/server/container/guice/protocols/managedsieve/src/main/java/org/apache/james/modules/protocols/SieveProbeImpl.java @@ -21,6 +21,7 @@ package org.apache.james.modules.protocols; import java.io.FileInputStream; import java.io.InputStream; import java.nio.charset.StandardCharsets; + import javax.inject.Inject; import org.apache.commons.io.IOUtils; diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java b/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java index a47fe94..4ad57ab 100644 --- a/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java +++ b/server/container/util/src/main/java/org/apache/james/util/concurrency/ConcurrentTestRunner.java @@ -40,6 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; + import reactor.core.publisher.Mono; public class ConcurrentTestRunner implements Closeable { diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/UrlsDao.java b/server/data/data-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/UrlsDao.java index ac72216..8600357 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/UrlsDao.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/UrlsDao.java @@ -36,6 +36,7 @@ import org.apache.james.mailrepository.api.MailRepositoryUrl; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraActiveScriptDAO.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraActiveScriptDAO.java index f9288fe..7cdc5b9 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraActiveScriptDAO.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraActiveScriptDAO.java @@ -42,6 +42,7 @@ import org.apache.james.sieverepository.api.ScriptName; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; + import reactor.core.publisher.Mono; public class CassandraActiveScriptDAO { diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java index 9a18265..be69c0f 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveDAO.java @@ -45,6 +45,7 @@ import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.datastax.driver.core.querybuilder.Select; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAO.java b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAO.java index 54c3072..4311a07 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAO.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraSieveQuotaDAO.java @@ -40,6 +40,7 @@ import org.apache.james.sieve.cassandra.tables.CassandraSieveSpaceTable; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; + import reactor.core.publisher.Mono; public class CassandraSieveQuotaDAO { diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistry.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistry.java index 218f0ad..4fa556f 100644 --- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistry.java +++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistry.java @@ -33,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.primitives.Ints; + import reactor.core.publisher.Mono; public class CassandraNotificationRegistry implements NotificationRegistry { diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryDAO.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryDAO.java index ea31e35..bf297ce 100644 --- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryDAO.java +++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraNotificationRegistryDAO.java @@ -38,6 +38,7 @@ import org.apache.james.jmap.cassandra.vacation.tables.CassandraNotificationTabl import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; import com.datastax.driver.core.querybuilder.Insert; + import reactor.core.publisher.Mono; public class CassandraNotificationRegistryDAO { diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java index ef8bac3..36d0562 100644 --- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java +++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationDAO.java @@ -46,6 +46,7 @@ import com.datastax.driver.core.Session; import com.datastax.driver.core.UserType; import com.datastax.driver.core.querybuilder.Insert; import com.google.common.collect.ImmutableList; + import reactor.core.publisher.Mono; public class CassandraVacationDAO { diff --git a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepository.java b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepository.java index b0448b3..06fc937 100644 --- a/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepository.java +++ b/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepository.java @@ -27,6 +27,7 @@ import org.apache.james.jmap.api.vacation.VacationPatch; import org.apache.james.jmap.api.vacation.VacationRepository; import com.google.common.base.Preconditions; + import reactor.core.publisher.Mono; public class CassandraVacationRepository implements VacationRepository { diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/vacation/MemoryNotificationRegistry.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/vacation/MemoryNotificationRegistry.java index 33e8c0d..315680e 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/vacation/MemoryNotificationRegistry.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/vacation/MemoryNotificationRegistry.java @@ -32,6 +32,7 @@ import org.apache.james.util.date.ZonedDateTimeProvider; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; + import reactor.core.publisher.Mono; public class MemoryNotificationRegistry implements NotificationRegistry { diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/vacation/MemoryVacationRepository.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/vacation/MemoryVacationRepository.java index 5f06c24..82e3b14 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/vacation/MemoryVacationRepository.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/vacation/MemoryVacationRepository.java @@ -28,6 +28,7 @@ import org.apache.james.jmap.api.vacation.VacationPatch; import org.apache.james.jmap.api.vacation.VacationRepository; import com.google.common.base.Preconditions; + import reactor.core.publisher.Mono; public class MemoryVacationRepository implements VacationRepository { 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 1b3c1c7..9fb41be 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 @@ -41,6 +41,7 @@ import com.github.fge.lambdas.runnable.ThrowingRunnable; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + import reactor.core.publisher.Mono; import reactor.core.scheduler.Scheduler; import reactor.core.scheduler.Schedulers; diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AddressExtractor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AddressExtractor.java index e0ded93..737e231 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AddressExtractor.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/AddressExtractor.java @@ -22,6 +22,7 @@ package org.apache.james.transport.mailets.redirect; import java.util.List; import java.util.Locale; import java.util.Optional; + import javax.mail.MessagingException; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/EnhancedMessagingException.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/EnhancedMessagingException.java index 06f8a61..eac87e2 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/EnhancedMessagingException.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/EnhancedMessagingException.java @@ -23,6 +23,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Optional; import java.util.function.Function; + import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/MessageComposer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/MessageComposer.java index 2dfa0a9..c438feb 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/MessageComposer.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remote/delivery/MessageComposer.java @@ -24,6 +24,7 @@ import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays; + import javax.mail.MessagingException; import javax.mail.SendFailedException; import javax.mail.internet.InternetAddress; diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractPriorityMatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractPriorityMatcher.java index 18170fd..f94148e 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractPriorityMatcher.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractPriorityMatcher.java @@ -19,6 +19,7 @@ package org.apache.james.transport.matchers; import java.util.Collection; + import javax.mail.MessagingException; import org.apache.james.core.MailAddress; diff --git a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryCountDAO.java b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryCountDAO.java index 444a2cf..c04f9c2 100644 --- a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryCountDAO.java +++ b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryCountDAO.java @@ -39,6 +39,7 @@ import org.apache.james.mailrepository.api.MailRepositoryUrl; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; + import reactor.core.publisher.Mono; public class CassandraMailRepositoryCountDAO { diff --git a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAO.java b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAO.java index 503a8ae..307c8e9 100644 --- a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAO.java +++ b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryKeysDAO.java @@ -37,6 +37,7 @@ import org.apache.james.mailrepository.api.MailRepositoryUrl; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAO.java b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAO.java index 981bf42..768dd7d 100644 --- a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAO.java +++ b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDAO.java @@ -85,6 +85,7 @@ import com.github.steveash.guavate.Guavate; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + import reactor.core.publisher.Mono; public class CassandraMailRepositoryMailDAO implements CassandraMailRepositoryMailDaoAPI { diff --git a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/MergingCassandraMailRepositoryMailDao.java b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/MergingCassandraMailRepositoryMailDao.java index 2c9deeb..e111888 100644 --- a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/MergingCassandraMailRepositoryMailDao.java +++ b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/MergingCassandraMailRepositoryMailDao.java @@ -29,6 +29,7 @@ import org.apache.james.mailrepository.api.MailRepositoryUrl; import org.apache.mailet.Mail; import com.google.common.annotations.VisibleForTesting; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTask.java b/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTask.java index eb8f2eb..b2e6c0d 100644 --- a/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTask.java +++ b/server/protocols/webadmin/webadmin-cassandra-data/src/main/java/org/apache/james/webadmin/service/CassandraMappingsSolveInconsistenciesTask.java @@ -33,6 +33,7 @@ import org.apache.james.task.TaskExecutionDetails; import org.apache.james.task.TaskType; import com.fasterxml.jackson.annotation.JsonProperty; + import reactor.core.publisher.Mono; public class CassandraMappingsSolveInconsistenciesTask implements Task { diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/utils/JsonTransformer.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/utils/JsonTransformer.java index e8a22e6..4ce1b0f 100644 --- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/utils/JsonTransformer.java +++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/utils/JsonTransformer.java @@ -33,6 +33,7 @@ import com.fasterxml.jackson.datatype.guava.GuavaModule; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.google.common.collect.ImmutableSet; + import spark.ResponseTransformer; public class JsonTransformer implements ResponseTransformer { diff --git a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java index 1931cef..2511f49 100644 --- a/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java +++ b/server/queue/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java @@ -84,6 +84,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterators; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java index 8a6186c..864fc3d 100644 --- a/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java +++ b/server/queue/queue-memory/src/main/java/org/apache/james/queue/memory/MemoryMailQueueFactory.java @@ -53,6 +53,7 @@ import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueue.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueue.java index 8a69787..2dc7663 100644 --- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueue.java +++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueue.java @@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory; import com.github.fge.lambdas.Throwing; import com.google.common.base.MoreObjects; + import reactor.core.publisher.Flux; public class RabbitMQMailQueue implements ManageableMailQueue { diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/BrowseStartDAO.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/BrowseStartDAO.java index 28b19b8..835e284 100644 --- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/BrowseStartDAO.java +++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/BrowseStartDAO.java @@ -41,6 +41,7 @@ import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.google.common.annotations.VisibleForTesting; + import reactor.core.publisher.Mono; public class BrowseStartDAO { diff --git a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDAO.java b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDAO.java index c398f94..e6156da 100644 --- a/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDAO.java +++ b/server/queue/queue-rabbitmq/src/main/java/org/apache/james/queue/rabbitmq/view/cassandra/EnqueuedMailsDAO.java @@ -66,6 +66,7 @@ import com.datastax.driver.core.BoundStatement; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; import com.datastax.driver.core.TupleType; + import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/server/task/task-memory/src/main/java/org/apache/james/task/MemoryTaskManager.java b/server/task/task-memory/src/main/java/org/apache/james/task/MemoryTaskManager.java index afe9a12..3d2da18 100644 --- a/server/task/task-memory/src/main/java/org/apache/james/task/MemoryTaskManager.java +++ b/server/task/task-memory/src/main/java/org/apache/james/task/MemoryTaskManager.java @@ -32,6 +32,7 @@ import javax.inject.Inject; import com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableList; + import reactor.core.publisher.Flux; import reactor.core.scheduler.Schedulers; diff --git a/server/task/task-memory/src/main/java/org/apache/james/task/SerialTaskManagerWorker.java b/server/task/task-memory/src/main/java/org/apache/james/task/SerialTaskManagerWorker.java index faf61ca..9bdad89 100644 --- a/server/task/task-memory/src/main/java/org/apache/james/task/SerialTaskManagerWorker.java +++ b/server/task/task-memory/src/main/java/org/apache/james/task/SerialTaskManagerWorker.java @@ -35,6 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.Sets; + import reactor.core.Disposable; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
