http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java index 8cb09ac..db8cc3a 100644 --- a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java +++ b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java @@ -21,8 +21,8 @@ package org.apache.james.user.api; import java.util.Iterator; -import org.apache.james.user.api.model.User; import org.apache.james.core.MailAddress; +import org.apache.james.user.api.model.User; /** * Interface for a repository of users. A repository represents a logical
http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java index 963060a..7f833ae 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/rrt/cassandra/CassandraRecipientRewriteTable.java @@ -27,9 +27,11 @@ import static org.apache.james.rrt.cassandra.tables.CassandraRecipientRewriteTab import static org.apache.james.rrt.cassandra.tables.CassandraRecipientRewriteTableTable.MAPPING; import static org.apache.james.rrt.cassandra.tables.CassandraRecipientRewriteTableTable.TABLE_NAME; import static org.apache.james.rrt.cassandra.tables.CassandraRecipientRewriteTableTable.USER; + import java.util.List; import java.util.Map; import java.util.Optional; + import javax.inject.Inject; import org.apache.james.backends.cassandra.utils.CassandraAsyncExecutor; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-cassandra/src/main/java/org/apache/james/sieve/cassandra/CassandraActiveScriptDAO.java ---------------------------------------------------------------------- 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 3ffe185..5f53375 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 @@ -23,11 +23,10 @@ import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker; import static com.datastax.driver.core.querybuilder.QueryBuilder.delete; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto; - import static com.datastax.driver.core.querybuilder.QueryBuilder.select; import static org.apache.james.sieve.cassandra.tables.CassandraSieveActiveTable.DATE; -import static org.apache.james.sieve.cassandra.tables.CassandraSieveActiveTable.TABLE_NAME; import static org.apache.james.sieve.cassandra.tables.CassandraSieveActiveTable.SCRIPT_NAME; +import static org.apache.james.sieve.cassandra.tables.CassandraSieveActiveTable.TABLE_NAME; import static org.apache.james.sieve.cassandra.tables.CassandraSieveActiveTable.USER_NAME; import java.util.Date; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java index e5f7626..2123562 100644 --- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java +++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/FileMailRepository.java @@ -35,12 +35,12 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; -import org.apache.james.server.core.MimeMessageWrapper; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.mailrepository.lib.AbstractMailRepository; import org.apache.james.repository.file.FilePersistentObjectRepository; import org.apache.james.repository.file.FilePersistentStreamRepository; +import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; +import org.apache.james.server.core.MimeMessageWrapper; import org.apache.mailet.Mail; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java index e1e784e..ec39f82 100644 --- a/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java +++ b/server/data/data-file/src/main/java/org/apache/james/mailrepository/file/MimeMessageStreamRepositorySource.java @@ -19,12 +19,12 @@ package org.apache.james.mailrepository.file; -import org.apache.james.server.core.MimeMessageSource; -import org.apache.james.repository.api.StreamRepository; - import java.io.IOException; import java.io.InputStream; +import org.apache.james.repository.api.StreamRepository; +import org.apache.james.server.core.MimeMessageSource; + public class MimeMessageStreamRepositorySource extends MimeMessageSource { // Define how to get to the data http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java b/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java index e906a00..876b004 100644 --- a/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java +++ b/server/data/data-file/src/test/java/org/apache/james/sieverepository/file/SieveFileRepositoryTest.java @@ -2,6 +2,12 @@ package org.apache.james.sieverepository.file; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + import org.apache.commons.io.FileUtils; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.sieverepository.api.SieveRepository; @@ -9,12 +15,6 @@ import org.apache.james.sieverepository.lib.AbstractSieveRepositoryTest; import org.junit.After; import org.junit.Before; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; - public class SieveFileRepositoryTest extends AbstractSieveRepositoryTest { private static final String SIEVE_ROOT = FileSystem.FILE_PROTOCOL + "sieve"; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java index 762df55..ff8ac28 100644 --- a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java +++ b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java @@ -58,11 +58,11 @@ import org.apache.commons.io.IOUtils; import org.apache.jackrabbit.commons.cnd.CndImporter; import org.apache.jackrabbit.util.ISO9075; import org.apache.jackrabbit.util.Text; -import org.apache.james.server.core.MailImpl; +import org.apache.james.core.MailAddress; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.lib.AbstractMailRepository; +import org.apache.james.server.core.MailImpl; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java index db09abe..e132822 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java @@ -51,16 +51,16 @@ import javax.sql.DataSource; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.james.server.core.MailImpl; -import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; -import org.apache.james.server.core.MimeMessageWrapper; +import org.apache.james.core.MailAddress; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.mailrepository.lib.AbstractMailRepository; import org.apache.james.repository.file.FilePersistentStreamRepository; +import org.apache.james.server.core.MailImpl; +import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; +import org.apache.james.server.core.MimeMessageWrapper; import org.apache.james.util.sql.JDBCUtil; import org.apache.james.util.sql.SqlResources; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java index 4985da6..16fbc98 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MessageInputStream.java @@ -30,10 +30,10 @@ import java.io.PipedOutputStream; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; +import org.apache.james.repository.api.StreamRepository; import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; import org.apache.james.server.core.MimeMessageUtil; import org.apache.james.server.core.MimeMessageWrapper; -import org.apache.james.repository.api.StreamRepository; import org.apache.mailet.Mail; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java index 18cf64d..5f0658e 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/MimeMessageJDBCSource.java @@ -29,8 +29,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.james.server.core.MimeMessageSource; import org.apache.james.repository.api.StreamRepository; +import org.apache.james.server.core.MimeMessageSource; import org.apache.james.util.sql.JDBCUtil; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java index 106e55f..b790d95 100644 --- a/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java +++ b/server/data/data-jdbc/src/main/java/org/apache/james/user/jdbc/JamesUsersJdbcRepository.java @@ -19,15 +19,15 @@ package org.apache.james.user.jdbc; -import org.apache.james.user.api.model.User; -import org.apache.james.user.lib.model.DefaultJamesUser; -import org.apache.james.user.lib.model.DefaultUser; -import org.apache.james.core.MailAddress; - import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import org.apache.james.core.MailAddress; +import org.apache.james.user.api.model.User; +import org.apache.james.user.lib.model.DefaultJamesUser; +import org.apache.james.user.lib.model.DefaultUser; + /** * A Jdbc-backed UserRepository which handles User instances of the * <code>DefaultJamesUser</code> class, or any superclass. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/vacation/CassandraVacationRepository.java ---------------------------------------------------------------------- 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 51574f5..aa2a1f4 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 @@ -25,8 +25,8 @@ import javax.inject.Inject; import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.Vacation; -import org.apache.james.jmap.api.vacation.VacationRepository; import org.apache.james.jmap.api.vacation.VacationPatch; +import org.apache.james.jmap.api.vacation.VacationRepository; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessToken.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessToken.java b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessToken.java index d206c68..6021bc1 100644 --- a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessToken.java +++ b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/access/AccessToken.java @@ -19,11 +19,11 @@ package org.apache.james.jmap.api.access; -import org.apache.james.jmap.api.access.exceptions.NotAnAccessTokenException; - import java.util.Objects; import java.util.UUID; +import org.apache.james.jmap.api.access.exceptions.NotAnAccessTokenException; + public class AccessToken { public static AccessToken fromString(String tokenString) throws NotAnAccessTokenException { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-jmap/src/main/java/org/apache/james/jmap/memory/vacation/MemoryVacationRepository.java ---------------------------------------------------------------------- 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 ca95c23..44cc538 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 @@ -25,8 +25,8 @@ import java.util.concurrent.CompletableFuture; import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.Vacation; -import org.apache.james.jmap.api.vacation.VacationRepository; import org.apache.james.jmap.api.vacation.VacationPatch; +import org.apache.james.jmap.api.vacation.VacationRepository; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/AbstractNotificationRegistryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/AbstractNotificationRegistryTest.java b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/AbstractNotificationRegistryTest.java index dd31bae..35666a0 100644 --- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/AbstractNotificationRegistryTest.java +++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/vacation/AbstractNotificationRegistryTest.java @@ -28,8 +28,8 @@ import java.time.ZonedDateTime; import java.util.Optional; import java.util.concurrent.TimeUnit; -import org.apache.james.util.date.ZonedDateTimeProvider; import org.apache.james.core.MailAddress; +import org.apache.james.util.date.ZonedDateTimeProvider; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java index c6296d5..20e7675 100644 --- a/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java +++ b/server/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/model/JPARecipientRewrite.java @@ -18,8 +18,6 @@ ****************************************************************/ package org.apache.james.rrt.jpa.model; -import com.google.common.base.Objects; - import java.io.Serializable; import javax.persistence.Column; @@ -30,6 +28,8 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; +import com.google.common.base.Objects; + /** * RecipientRewriteTable class for the James Virtual User Table to be used for JPA * persistence. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java index 5a2ffad..489f35e 100644 --- a/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java +++ b/server/data/data-ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.Optional; import java.util.Properties; import java.util.Set; + import javax.annotation.PostConstruct; import javax.naming.Context; import javax.naming.NamingEnumeration; @@ -39,6 +40,11 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapContext; +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.commons.lang.StringUtils; +import org.apache.directory.api.ldap.model.filter.FilterEncoder; +import org.apache.james.core.MailAddress; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; @@ -47,11 +53,6 @@ import org.apache.james.user.ldap.api.LdapConstants; import org.apache.james.util.retry.DoublingRetrySchedule; import org.apache.james.util.retry.api.RetrySchedule; import org.apache.james.util.retry.naming.ldap.RetryingLdapContext; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.lang.StringUtils; -import org.apache.directory.api.ldap.model.filter.FilterEncoder; -import org.apache.james.core.MailAddress; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java index 92eee8a..730f9d4 100644 --- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java +++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/AbstractRecipientRewriteTable.java @@ -28,13 +28,13 @@ import javax.mail.internet.ParseException; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.james.core.MailAddress; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.rrt.api.RecipientRewriteTable; import org.apache.james.rrt.api.RecipientRewriteTableException; import org.apache.james.rrt.lib.Mapping.Type; -import org.apache.james.core.MailAddress; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java index 6349a52..19a5db6 100644 --- a/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java +++ b/server/data/data-library/src/main/java/org/apache/james/rrt/lib/RecipientRewriteTableUtil.java @@ -26,8 +26,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.apache.james.rrt.api.RecipientRewriteTable; import org.apache.james.core.MailAddress; +import org.apache.james.rrt.api.RecipientRewriteTable; /** * This helper class contains methods for the RecipientRewriteTable implementations http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-library/src/main/java/org/apache/james/sieverepository/lib/SieveRepositoryManagement.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/sieverepository/lib/SieveRepositoryManagement.java b/server/data/data-library/src/main/java/org/apache/james/sieverepository/lib/SieveRepositoryManagement.java index b89eb97..c5b2ca4 100644 --- a/server/data/data-library/src/main/java/org/apache/james/sieverepository/lib/SieveRepositoryManagement.java +++ b/server/data/data-library/src/main/java/org/apache/james/sieverepository/lib/SieveRepositoryManagement.java @@ -20,14 +20,14 @@ package org.apache.james.sieverepository.lib; -import org.apache.james.sieverepository.api.SieveRepository; -import org.apache.james.sieverepository.api.SieveRepositoryManagementMBean; -import org.apache.james.sieverepository.api.exception.SieveRepositoryException; - import javax.inject.Inject; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; +import org.apache.james.sieverepository.api.SieveRepository; +import org.apache.james.sieverepository.api.SieveRepositoryManagementMBean; +import org.apache.james.sieverepository.api.exception.SieveRepositoryException; + public class SieveRepositoryManagement extends StandardMBean implements SieveRepositoryManagementMBean { private SieveRepository sieveRepository; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java index ebc60ee..3d3c566 100644 --- a/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java +++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java @@ -20,17 +20,18 @@ package org.apache.james.user.lib; import java.util.Optional; + import javax.inject.Inject; +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.james.core.MailAddress; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.user.api.AlreadyExistInUsersRepositoryException; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.james.core.MailAddress; import com.google.common.annotations.VisibleForTesting; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java index 6f0960e..a635e18 100644 --- a/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java +++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultJamesUser.java @@ -19,8 +19,8 @@ package org.apache.james.user.lib.model; -import org.apache.james.user.api.model.JamesUser; import org.apache.james.core.MailAddress; +import org.apache.james.user.api.model.JamesUser; /** * Implementation of User Interface. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java index c0223cc..891c076 100644 --- a/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java +++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/model/DefaultUser.java @@ -19,12 +19,12 @@ package org.apache.james.user.lib.model; -import org.apache.james.user.api.model.User; -import org.apache.james.user.lib.util.DigestUtil; - import java.io.Serializable; import java.security.NoSuchAlgorithmException; +import org.apache.james.user.api.model.User; +import org.apache.james.user.lib.util.DigestUtil; + /** * Implementation of User Interface. Instances of this class do not allow the * the user name to be reset. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java b/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java index 571d314..75610ef 100644 --- a/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/mailrepository/AbstractMailRepositoryTest.java @@ -33,13 +33,13 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import javax.mail.util.SharedByteArrayInputStream; +import org.apache.james.core.MailAddress; +import org.apache.james.lifecycle.api.LifecycleUtil; +import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.server.core.MailImpl; import org.apache.james.server.core.MimeMessageCopyOnWriteProxy; import org.apache.james.server.core.MimeMessageInputStreamSource; -import org.apache.james.lifecycle.api.LifecycleUtil; -import org.apache.james.mailrepository.api.MailRepository; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.junit.After; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java index db10629..5ac3a9c 100644 --- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/MappingsImplTest.java @@ -21,6 +21,7 @@ package org.apache.james.rrt.lib; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Optional; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RecipientRewriteTableUtilTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RecipientRewriteTableUtilTest.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RecipientRewriteTableUtilTest.java index 54393e6..50b86b8 100644 --- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RecipientRewriteTableUtilTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RecipientRewriteTableUtilTest.java @@ -18,12 +18,11 @@ ****************************************************************/ package org.apache.james.rrt.lib; +import static org.assertj.core.api.Assertions.assertThat; + import org.apache.james.core.MailAddress; import org.junit.Test; - -import static org.assertj.core.api.Assertions.assertThat; - public class RecipientRewriteTableUtilTest { @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java index dca065a..1d34baf 100644 --- a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java @@ -19,16 +19,17 @@ package org.apache.james.user.lib; import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Iterator; import java.util.Optional; +import org.apache.james.core.MailAddress; import org.apache.james.domainlist.api.mock.SimpleDomainList; import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.user.api.AlreadyExistInUsersRepositoryException; import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.user.api.model.User; -import org.apache.james.core.MailAddress; import org.junit.Assume; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java ---------------------------------------------------------------------- diff --git a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java index b24d0ae..7c8b03a 100644 --- a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java +++ b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java @@ -25,12 +25,12 @@ import java.util.Locale; import java.util.Map; import java.util.Optional; +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.user.api.model.User; import org.apache.james.user.lib.AbstractUsersRepository; import org.apache.james.user.lib.model.DefaultUser; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.HierarchicalConfiguration; public class MemoryUsersRepository extends AbstractUsersRepository { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java index b017862..edcba79 100644 --- a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java +++ b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java @@ -18,17 +18,18 @@ ****************************************************************/ package org.apache.james.dnsservice.api; -import com.google.common.collect.ImmutableList; -import org.apache.james.dnsservice.api.mock.MockDNSService; -import org.junit.Ignore; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Collection; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.james.dnsservice.api.mock.MockDNSService; +import org.junit.Ignore; +import org.junit.Test; + +import com.google.common.collect.ImmutableList; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/DNSFixture.java ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/DNSFixture.java b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/DNSFixture.java index 91fbf3e..bd91def 100644 --- a/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/DNSFixture.java +++ b/server/dns-service/dnsservice-api/src/test/java/org/apache/james/dnsservice/api/mock/DNSFixture.java @@ -22,9 +22,10 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Collection; -import com.google.common.collect.ImmutableList; import org.apache.james.dnsservice.api.DNSService; +import com.google.common.collect.ImmutableList; + /** * Some DNS Fixtures used by various Test related to DNS and InetNetwork. */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java index d944849..c046a67 100644 --- a/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java +++ b/server/dns-service/dnsservice-library/src/main/java/org/apache/james/dnsservice/library/inetnetwork/model/Inet6Network.java @@ -18,12 +18,12 @@ ****************************************************************/ package org.apache.james.dnsservice.library.inetnetwork.model; -import org.apache.james.dnsservice.library.inetnetwork.InetNetworkBuilder; - import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; +import org.apache.james.dnsservice.library.inetnetwork.InetNetworkBuilder; + public class Inet6Network implements InetNetwork { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java index 170ee34..727b329 100644 --- a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java +++ b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java @@ -18,13 +18,14 @@ ****************************************************************/ package org.apache.james.dnsservice.library.inetnetwork; +import static org.junit.Assert.assertEquals; + import java.net.UnknownHostException; + import org.apache.james.dnsservice.api.mock.DNSFixture; import org.apache.james.dnsservice.library.inetnetwork.model.InetNetwork; import org.junit.Test; -import static org.junit.Assert.assertEquals; - /** * Test the InetNetworkBuilder. */ http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java index 2fa35ee..35904e1 100644 --- a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java +++ b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java @@ -18,15 +18,16 @@ ****************************************************************/ package org.apache.james.dnsservice.library.inetnetwork.model; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.StringTokenizer; -import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.junit.Test; /** * Test the InetNetwork class with various IPv4 and IPv6 network specification. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java index 82449b9..ba77a2b 100644 --- a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java +++ b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java @@ -18,12 +18,13 @@ ****************************************************************/ package org.apache.james.dnsservice.library.netmatcher; +import static org.junit.Assert.assertEquals; + import java.net.UnknownHostException; + import org.apache.james.dnsservice.api.mock.DNSFixture; import org.junit.Test; -import static org.junit.Assert.assertEquals; - /** * Test the NetMatcher class with various IPv4 and IPv6 parameters. * http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java ---------------------------------------------------------------------- diff --git a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java index 89bc77b..332e789 100644 --- a/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java +++ b/server/karaf/integration/src/test/java/org/apache/james/karaf/features/KarafLiveTestSupport.java @@ -1,20 +1,26 @@ package org.apache.james.karaf.features; -import com.google.common.base.Stopwatch; -import org.apache.karaf.features.Feature; -import org.apache.karaf.features.FeaturesService; -import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFilePutOption; import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration; import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.keepRuntimeFolder; import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel; -import org.apache.karaf.tooling.exam.options.LogLevelOption; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.junit.Before; -import org.junit.runner.RunWith; import static org.ops4j.pax.exam.CoreOptions.maven; import static org.ops4j.pax.exam.CoreOptions.systemProperty; + +import java.io.File; +import java.net.URI; +import java.util.concurrent.TimeUnit; + +import javax.inject.Inject; + +import org.apache.karaf.features.Feature; +import org.apache.karaf.features.FeaturesService; +import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFilePutOption; +import org.apache.karaf.tooling.exam.options.LogLevelOption; +import org.junit.Before; +import org.junit.runner.RunWith; import org.ops4j.pax.exam.MavenUtils; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.Configuration; @@ -29,10 +35,7 @@ import org.osgi.util.tracker.ServiceTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import java.io.File; -import java.net.URI; -import java.util.concurrent.TimeUnit; +import com.google.common.base.Stopwatch; /** * Base class for integration testing with Karaf. http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java b/server/mailet/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java index 58194ae..27bea5a 100644 --- a/server/mailet/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java +++ b/server/mailet/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MailetLoader.java @@ -19,11 +19,11 @@ package org.apache.james.mailetcontainer.api; +import javax.mail.MessagingException; + import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; -import javax.mail.MessagingException; - /** * Implementations of this interface are responsible to create {@link Mailet} * instances http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java b/server/mailet/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java index 681e0e1..5d4e084 100644 --- a/server/mailet/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java +++ b/server/mailet/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/MatcherLoader.java @@ -19,11 +19,11 @@ package org.apache.james.mailetcontainer.api; +import javax.mail.MessagingException; + import org.apache.mailet.Matcher; import org.apache.mailet.MatcherConfig; -import javax.mail.MessagingException; - /** * Implementations of this interface are responsible for loading {@link Matcher} * instances http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMailet.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMailet.java b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMailet.java index 273fc63..9f599db 100644 --- a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMailet.java +++ b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMailet.java @@ -19,6 +19,7 @@ package org.apache.james.mailetcontainer.api.mock; import javax.mail.MessagingException; + import org.apache.mailet.Mail; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMatcher.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMatcher.java b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMatcher.java index 839c981..c802bd6 100644 --- a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMatcher.java +++ b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/ExceptionThrowingMatcher.java @@ -19,9 +19,11 @@ package org.apache.james.mailetcontainer.api.mock; import java.util.Collection; + import javax.mail.MessagingException; -import org.apache.mailet.Mail; + import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Matcher; import org.apache.mailet.MatcherConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java index 1d2df58..cf1451b 100644 --- a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java +++ b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java @@ -19,6 +19,7 @@ package org.apache.james.mailetcontainer.api.mock; import javax.mail.MessagingException; + import org.apache.james.mailetcontainer.api.MailProcessor; import org.apache.mailet.Mail; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailet.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailet.java b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailet.java index 93c170c..f0a1e54 100644 --- a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailet.java +++ b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailet.java @@ -19,6 +19,7 @@ package org.apache.james.mailetcontainer.api.mock; import javax.mail.MessagingException; + import org.apache.mailet.Mail; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java index e95b606..11dceab 100644 --- a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java +++ b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetLoader.java @@ -19,6 +19,7 @@ package org.apache.james.mailetcontainer.api.mock; import javax.mail.MessagingException; + import org.apache.james.mailetcontainer.api.MailetLoader; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java index 170e83f..bf1ba43 100644 --- a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java +++ b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcher.java @@ -25,8 +25,8 @@ import java.util.List; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Matcher; import org.apache.mailet.MatcherConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java index e9465f9..e525983 100644 --- a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java +++ b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMatcherLoader.java @@ -19,6 +19,7 @@ package org.apache.james.mailetcontainer.api.mock; import javax.mail.MessagingException; + import org.apache.james.mailetcontainer.api.MatcherLoader; import org.apache.mailet.Matcher; import org.apache.mailet.MatcherConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java index b8a44a1..b31497f 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/ProcessorUtil.java @@ -25,8 +25,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.MailetException; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java index 456d098..d2c5000 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/And.java @@ -24,8 +24,8 @@ import java.util.Set; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Matcher; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java index 1cc0cc6..35fde7e 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Not.java @@ -22,10 +22,11 @@ package org.apache.james.mailetcontainer.impl.matchers; import java.util.ArrayList; import java.util.Collection; import java.util.Optional; + import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Matcher; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java index 4c0ed8c..0eeb1f9 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Or.java @@ -24,8 +24,8 @@ import java.util.HashSet; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Matcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java index cb67528..49ba0cc 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/matchers/Xor.java @@ -22,10 +22,11 @@ package org.apache.james.mailetcontainer.impl.matchers; import java.util.ArrayList; import java.util.Collection; import java.util.Optional; + import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Matcher; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java index 4b4e94a..ce78eaa 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java @@ -33,6 +33,7 @@ import javax.management.NotCompliantMBeanException; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; +import org.apache.james.core.MailAddress; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.mailetcontainer.api.MailProcessor; import org.apache.james.mailetcontainer.api.MailetLoader; @@ -43,7 +44,6 @@ import org.apache.james.mailetcontainer.impl.MatcherMailetPair; import org.apache.james.mailetcontainer.impl.jmx.JMXStateMailetProcessorListener; import org.apache.james.mailetcontainer.impl.matchers.CompositeMatcher; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; import org.apache.mailet.MailetContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java index a851eb3..aa58549 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/AndTest.java @@ -19,14 +19,14 @@ package org.apache.james.mailetcontainer.impl.matchers; import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES; -import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES; import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES2; +import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java index f3bb18b..0d718e8 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/NotTest.java @@ -23,8 +23,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java index 4fa4b15..27e9368 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/OrTest.java @@ -20,15 +20,15 @@ package org.apache.james.mailetcontainer.impl.matchers; import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES; -import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES; import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES2; +import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES; import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES2; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java index ac16d65..35b298f 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/matchers/XorTest.java @@ -19,15 +19,15 @@ package org.apache.james.mailetcontainer.impl.matchers; import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES; -import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES; import static org.apache.mailet.base.MailAddressFixture.ANY_AT_JAMES2; +import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES; import static org.apache.mailet.base.MailAddressFixture.OTHER_AT_JAMES2; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.Matcher; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java index ec66062..20b1119 100644 --- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java +++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java @@ -30,9 +30,9 @@ import javax.mail.MessagingException; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.james.server.core.MailImpl; import org.apache.james.mailetcontainer.api.MailProcessor; import org.apache.james.mailetcontainer.api.mock.MockMailProcessor; +import org.apache.james.server.core.MailImpl; import org.apache.mailet.Mail; import org.junit.Rule; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java index 7c9f27e..410ee62 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTable.java @@ -32,14 +32,14 @@ import javax.inject.Inject; import javax.mail.MessagingException; import javax.mail.internet.ParseException; -import org.apache.james.server.core.MailImpl; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.rrt.lib.RecipientRewriteTableUtil; +import org.apache.james.server.core.MailImpl; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java index 07234e5..5f2fb45 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/BayesianAnalysis.java @@ -31,12 +31,12 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import javax.sql.DataSource; +import org.apache.james.core.MailAddress; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.util.bayesian.JDBCBayesianAnalyzer; import org.apache.james.util.sql.JDBCUtil; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.apache.mailet.base.RFC2822Headers; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Bounce.java ---------------------------------------------------------------------- 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 5c5b503..0d2d1a6 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 @@ -21,10 +21,12 @@ package org.apache.james.transport.mailets; import java.util.List; import java.util.Optional; + import javax.inject.Inject; import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.redirect.InitParameters; import org.apache.james.transport.mailets.redirect.NotifyMailetInitParameters; @@ -40,7 +42,6 @@ import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java index d0a9e0f..66dc638 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java @@ -25,6 +25,7 @@ import java.util.Date; import java.util.List; import java.util.Optional; import java.util.regex.Pattern; + import javax.inject.Inject; import javax.mail.MessagingException; import javax.mail.Session; @@ -33,8 +34,9 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import org.apache.commons.lang3.time.FastDateFormat; -import org.apache.james.server.core.MailImpl; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; +import org.apache.james.server.core.MailImpl; import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.james.transport.mailets.redirect.InitParameters; import org.apache.james.transport.mailets.redirect.MailModifier; @@ -52,7 +54,6 @@ import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.DateFormats; import org.apache.mailet.base.GenericMailet; import org.apache.mailet.base.RFC2822Headers; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java index a4d56a0..ef8bf1c 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCAlias.java @@ -32,10 +32,10 @@ import javax.mail.MessagingException; import javax.mail.internet.ParseException; import javax.sql.DataSource; +import org.apache.james.core.MailAddress; import org.apache.james.util.sql.JDBCUtil; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.MailetException; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java index 5d4e759..34111e6 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/JDBCRecipientRewriteTable.java @@ -31,10 +31,10 @@ import javax.inject.Inject; import javax.mail.MessagingException; import javax.sql.DataSource; +import org.apache.james.core.MailAddress; import org.apache.james.rrt.lib.RecipientRewriteTableUtil; import org.apache.james.util.sql.JDBCUtil; import org.apache.mailet.Experimental; -import org.apache.james.core.MailAddress; import org.apache.mailet.MailetException; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java index 8d030d4..ec6cdcf 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifyPostmaster.java @@ -21,10 +21,12 @@ package org.apache.james.transport.mailets; import java.util.List; import java.util.Optional; + import javax.inject.Inject; import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.redirect.AddressExtractor; import org.apache.james.transport.mailets.redirect.InitParameters; @@ -41,7 +43,6 @@ import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.MailetConfig; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java index 62377ee..a8deba1 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/NotifySender.java @@ -21,10 +21,12 @@ package org.apache.james.transport.mailets; import java.util.List; import java.util.Optional; + import javax.inject.Inject; import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.redirect.AddressExtractor; import org.apache.james.transport.mailets.redirect.InitParameters; @@ -41,7 +43,6 @@ import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.MailetConfig; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java index b47cb28..ec49b8b 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessor.java @@ -24,10 +24,12 @@ import java.util.Optional; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Stream; + import javax.mail.MessagingException; import javax.mail.internet.AddressException; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.rrt.api.RecipientRewriteTable; @@ -37,7 +39,6 @@ import org.apache.james.rrt.lib.Mapping; import org.apache.james.rrt.lib.Mappings; import org.apache.james.util.streams.Iterators; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java index cc1f1fd..bd787d9 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Redirect.java @@ -21,10 +21,12 @@ package org.apache.james.transport.mailets; import java.util.List; import java.util.Optional; + import javax.inject.Inject; import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.james.transport.mailets.redirect.AddressExtractor; @@ -42,7 +44,6 @@ import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java ---------------------------------------------------------------------- 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 f761c16..43307e3 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 @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.inject.Inject; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; import org.apache.james.metrics.api.MetricFactory; @@ -42,7 +43,6 @@ import org.apache.james.transport.mailets.remoteDelivery.DeliveryRunnable; import org.apache.james.transport.mailets.remoteDelivery.RemoteDeliveryConfiguration; import org.apache.james.transport.mailets.remoteDelivery.RemoteDeliverySocketFactory; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java index 46efc81..1975c9a 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/Resend.java @@ -21,10 +21,12 @@ package org.apache.james.transport.mailets; import java.util.List; import java.util.Optional; + import javax.inject.Inject; import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.redirect.AddressExtractor; import org.apache.james.transport.mailets.redirect.InitParameters; @@ -40,7 +42,6 @@ import org.apache.james.transport.util.SenderUtils; import org.apache.james.transport.util.SpecialAddressesUtils; import org.apache.james.transport.util.TosUtils; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java index 0185e8b..b466f55 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java @@ -22,13 +22,13 @@ package org.apache.james.transport.mailets; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.james.jspf.core.Logger; import org.apache.james.jspf.executor.SPFResult; import org.apache.james.jspf.impl.DefaultSPF; import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java index 166360f..ffaf1f6 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/ToSenderFolder.java @@ -22,13 +22,13 @@ import javax.inject.Inject; import javax.inject.Named; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.mailbox.MailboxManager; import org.apache.james.transport.mailets.delivery.MailboxAppender; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
