http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java index b0fcffe..35e1eef 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/WhiteListManager.java @@ -46,6 +46,7 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.sql.DataSource; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.model.JamesUser; @@ -53,7 +54,6 @@ import org.apache.james.util.sql.JDBCUtil; import org.apache.james.util.sql.SqlResources; import org.apache.mailet.Experimental; 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/XMLRecipientRewriteTable.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java index d362a3f..084acd5 100755 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/XMLRecipientRewriteTable.java @@ -26,9 +26,9 @@ import java.util.Map; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.rrt.lib.RecipientRewriteTableUtil; import org.apache.mailet.Experimental; -import org.apache.james.core.MailAddress; /** * <p> http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java ---------------------------------------------------------------------- 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 6611330..502e160 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 @@ -23,11 +23,12 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; + import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.apache.mailet.MailetContext; import org.apache.mailet.PerRecipientHeaders.Header; 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/delivery/MailStore.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java index fed03e0..6f5eff6 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailStore.java @@ -21,8 +21,8 @@ package org.apache.james.transport.mailets.delivery; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; public interface MailStore { String DELIVERY_PATH_PREFIX = "DeliveryPath_"; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java index c41cdad..2db2bf1 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/SimpleMailStore.java @@ -21,12 +21,12 @@ package org.apache.james.transport.mailets.delivery; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.mailbox.model.ComposedMessageId; import org.apache.james.metrics.api.Metric; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; 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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java index f9a0925..e21d0ed 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java @@ -23,8 +23,8 @@ import java.util.Collection; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; import org.joda.time.DateTime; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java index 15fced5..53b0dcb 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java @@ -21,8 +21,8 @@ package org.apache.james.transport.mailets.jsieve; import javax.mail.MessagingException; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java index ed4d6a0..299ab01 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java @@ -20,10 +20,10 @@ package org.apache.james.transport.mailets.jsieve; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.jsieve.mail.Action; import org.apache.jsieve.mail.ActionFileInto; 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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java index bc016e0..9193bdb 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java @@ -24,10 +24,10 @@ import java.util.Collection; import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; +import org.apache.james.core.MailAddress; import org.apache.jsieve.mail.Action; import org.apache.jsieve.mail.ActionRedirect; 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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java index fdb3f33..370f424 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java @@ -29,6 +29,7 @@ import javax.mail.Multipart; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.james.mdn.MDN; import org.apache.james.mdn.MDNReport; import org.apache.james.mdn.action.mode.DispositionActionMode; @@ -39,7 +40,6 @@ import org.apache.james.mdn.type.DispositionType; import org.apache.jsieve.mail.Action; import org.apache.jsieve.mail.ActionReject; 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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java index 06ba496..736687f 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ResourceLocator.java @@ -18,14 +18,14 @@ ****************************************************************/ package org.apache.james.transport.mailets.jsieve; +import java.io.InputStream; + +import org.apache.james.core.MailAddress; import org.apache.james.sieverepository.api.SieveRepository; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; -import org.apache.james.core.MailAddress; import org.joda.time.DateTime; -import java.io.InputStream; - public class ResourceLocator { public static class UserSieveInformation { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java index 9ab6c70..b87b705 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java @@ -33,6 +33,7 @@ import javax.mail.Header; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.james.mime4j.dom.address.AddressList; import org.apache.james.mime4j.dom.address.Mailbox; import org.apache.james.mime4j.dom.address.MailboxList; @@ -49,7 +50,6 @@ import org.apache.jsieve.mail.MailUtils; import org.apache.jsieve.mail.SieveMailException; import org.apache.jsieve.mail.optional.EnvelopeAccessors; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; import org.joda.time.DateTime; 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/jsieve/VacationAction.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java index 9c67bc4..3f651aa 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java @@ -25,10 +25,10 @@ import java.util.Set; import javax.mail.MessagingException; import javax.mail.internet.AddressException; +import org.apache.james.core.MailAddress; import org.apache.jsieve.mail.Action; import org.apache.jsieve.mail.optional.ActionVacation; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.joda.time.Days; 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/jsieve/VacationReply.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java index f7207f7..516aeb2 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java @@ -22,6 +22,7 @@ package org.apache.james.transport.mailets.jsieve; import java.io.IOException; import java.util.List; import java.util.Optional; + import javax.activation.DataHandler; import javax.mail.MessagingException; import javax.mail.Multipart; @@ -31,8 +32,8 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.util.ByteArrayDataSource; -import org.apache.mailet.Mail; import org.apache.james.core.MailAddress; +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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java index e7ab752..bd50190 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java @@ -25,6 +25,7 @@ import java.io.IOException; import javax.mail.MessagingException; import org.apache.commons.logging.Log; +import org.apache.james.core.MailAddress; import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; import org.apache.james.transport.mailets.jsieve.ActionDispatcher; import org.apache.james.transport.mailets.jsieve.ResourceLocator; @@ -36,7 +37,6 @@ import org.apache.jsieve.exception.SieveException; import org.apache.jsieve.parser.generated.ParseException; import org.apache.jsieve.parser.generated.TokenMgrError; 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/jsieve/delivery/SievePoster.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java index 824b988..f7099b8 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SievePoster.java @@ -23,12 +23,12 @@ import java.util.Locale; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.delivery.MailStore; import org.apache.james.transport.mailets.jsieve.Poster; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; public class SievePoster implements Poster { private final String folder; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java index cfb1c63..4a11065 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/MailModifier.java @@ -22,15 +22,16 @@ import java.net.UnknownHostException; import java.util.Date; import java.util.List; import java.util.Optional; + import javax.mail.Message; import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; -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.util.MailAddressUtils; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.DateFormats; 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/redirect/RedirectNotify.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java index 682beb1..0bf1d25 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/RedirectNotify.java @@ -21,14 +21,15 @@ package org.apache.james.transport.mailets.redirect; import java.util.List; import java.util.Optional; + 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; import org.apache.james.transport.mailets.utils.MimeMessageModifier; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java index 4dd04e1..9fbf7c8 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverter.java @@ -22,11 +22,12 @@ package org.apache.james.transport.mailets.remoteDelivery; import java.util.Arrays; import java.util.List; import java.util.Optional; + import javax.mail.Address; import javax.mail.internet.AddressException; -import org.apache.james.util.OptionalUtils; import org.apache.james.core.MailAddress; +import org.apache.james.util.OptionalUtils; 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/MailDelivrer.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java index 17f04d6..b6ce913 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/MailDelivrer.java @@ -28,11 +28,11 @@ import javax.mail.MessagingException; import javax.mail.SendFailedException; import javax.mail.internet.InternetAddress; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.TemporaryResolutionException; import org.apache.mailet.HostAddress; 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/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliverySocketFactory.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliverySocketFactory.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliverySocketFactory.java index 569ca0a..d4a5ba5 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliverySocketFactory.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/remoteDelivery/RemoteDeliverySocketFactory.java @@ -19,14 +19,14 @@ package org.apache.james.transport.mailets.remoteDelivery; -import javax.net.SocketFactory; - import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; import java.net.UnknownHostException; +import javax.net.SocketFactory; + /** * <p> * It is used by RemoteDelivery in order to make possible to bind the client http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java index 40477b3..338cf06 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/AbstractSQLWhitelistMatcher.java @@ -34,6 +34,7 @@ import javax.inject.Inject; import javax.mail.MessagingException; import javax.sql.DataSource; +import org.apache.james.core.MailAddress; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.transport.mailets.WhiteListManager; import org.apache.james.user.api.UsersRepository; @@ -42,7 +43,6 @@ import org.apache.james.util.sql.JDBCUtil; import org.apache.james.util.sql.SqlResources; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; 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/matchers/InSpammerBlacklist.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java index bcc55e6..75e6756 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/InSpammerBlacklist.java @@ -26,10 +26,10 @@ import java.util.StringTokenizer; import javax.inject.Inject; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java index 6aa7b2a..e9d4b66 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java @@ -27,9 +27,9 @@ import java.util.Locale; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.mailet.Experimental; 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/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java index f07665d..64def8f 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsOverQuota.java @@ -26,6 +26,7 @@ import java.util.List; import javax.inject.Inject; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.mailbox.MailboxManager; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.exception.MailboxException; @@ -36,7 +37,6 @@ import org.apache.james.mailbox.quota.QuotaRootResolver; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; /** http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java index cc438fe..ff60d47 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java @@ -18,13 +18,13 @@ ****************************************************************/ package org.apache.james.transport.matchers; +import javax.mail.MessagingException; + +import org.apache.james.core.MailAddress; import org.apache.mailet.Experimental; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.Matcher; -import javax.mail.MessagingException; - /** * Matcher which can be used to set a quota for users Mailbox. This * {@link Matcher} need to recalculate the used space of users mailbox on every http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java index 05fab7d..2978859 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java @@ -29,11 +29,11 @@ import java.util.Locale; 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.dnsservice.library.netmatcher.NetMatcher; import org.apache.mailet.Experimental; 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/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java index 2cca1c4..75fa3a6 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrInNetwork.java @@ -19,11 +19,11 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; - import java.util.Collection; +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; + /** * <p> * Checks the IP address of the sending server against a comma- delimited list http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java index 6741ce7..c743da7 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/RemoteAddrNotInNetwork.java @@ -19,11 +19,11 @@ package org.apache.james.transport.matchers; -import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; - import java.util.Collection; +import org.apache.james.core.MailAddress; +import org.apache.mailet.Mail; + /** * <p> * Checks the IP address of the sending server against a comma- delimited list http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java index 0bc343a..a6ce9ea 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/SenderInFakeDomain.java @@ -21,9 +21,9 @@ package org.apache.james.transport.matchers; import java.util.Collection; +import org.apache.james.core.MailAddress; import org.apache.mailet.Experimental; 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/mailet/mailets/src/main/java/org/apache/james/transport/util/MailAddressUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailAddressUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailAddressUtils.java index 708ee4a..82d64e2 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailAddressUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/MailAddressUtils.java @@ -20,11 +20,12 @@ package org.apache.james.transport.util; import java.util.List; import java.util.stream.Stream; + import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; -import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.james.core.MailAddress; +import org.apache.james.transport.mailets.redirect.SpecialAddress; import com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/util/Patterns.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/Patterns.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/Patterns.java index 319883d..3cd1cf8 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/Patterns.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/Patterns.java @@ -1,10 +1,10 @@ package org.apache.james.transport.util; -import com.google.common.base.Throwables; - import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import com.google.common.base.Throwables; + public class Patterns { public static Pattern compilePatternUncheckedException(String pattern) { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/util/RecipientsUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/RecipientsUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/RecipientsUtils.java index 16c45ac..c6353e8 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/RecipientsUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/RecipientsUtils.java @@ -22,10 +22,10 @@ import java.util.List; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/util/ReplyToUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/ReplyToUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/ReplyToUtils.java index 1b00a6f..a9ea05d 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/ReplyToUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/ReplyToUtils.java @@ -19,11 +19,12 @@ package org.apache.james.transport.util; import java.util.Optional; + import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; public class ReplyToUtils { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java index 1caa0a5..6035b7b 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SenderUtils.java @@ -19,11 +19,12 @@ package org.apache.james.transport.util; import java.util.Optional; + import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; public class SenderUtils { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java index 5c6ecc9..7cd8bcc 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/SpecialAddressesUtils.java @@ -22,17 +22,18 @@ import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.Set; + import javax.mail.MessagingException; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; import javax.mail.internet.ParseException; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.redirect.AddressExtractor; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.james.transport.mailets.redirect.SpecialAddressKind; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.RFC2822Headers; 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/util/TosUtils.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/TosUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/TosUtils.java index 06176cf..a7fd76f 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/util/TosUtils.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/util/TosUtils.java @@ -23,10 +23,10 @@ import java.util.List; import javax.mail.MessagingException; import javax.mail.internet.InternetAddress; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java index 2a5ccdd..f43c22e 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java @@ -33,9 +33,9 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage.RecipientType; import javax.mail.internet.NewsAddress; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.managesieve.ManageSieveMailet; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/BounceTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/BounceTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/BounceTest.java index cbe0af2..146a2f2 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/BounceTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/BounceTest.java @@ -30,9 +30,9 @@ import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java index e3def5f..3d18abe 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ForwardTest.java @@ -22,15 +22,17 @@ package org.apache.james.transport.mailets; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; + import java.net.UnknownHostException; import java.util.Collection; import java.util.Properties; + import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; -import org.apache.james.dnsservice.api.DNSService; import org.apache.james.core.MailAddress; +import org.apache.james.dnsservice.api.DNSService; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java index fd455ed..5cfdd6c 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifyPostmasterTest.java @@ -30,9 +30,9 @@ import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java index 6b9c6b4..145dd4e 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/NotifySenderTest.java @@ -30,9 +30,9 @@ import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java index 242c0b3..ae97e36 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableProcessorTest.java @@ -31,13 +31,13 @@ import javax.mail.MessagingException; import javax.mail.Session; 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.ErrorMappingException; import org.apache.james.rrt.api.RecipientRewriteTableException; import org.apache.james.rrt.lib.MappingsImpl; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java index 7f90aab..468b560 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/RedirectTest.java @@ -22,14 +22,16 @@ package org.apache.james.transport.mailets; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; + import java.net.UnknownHostException; import java.util.Properties; + import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; -import org.apache.james.dnsservice.api.DNSService; import org.apache.james.core.MailAddress; +import org.apache.james.dnsservice.api.DNSService; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java index 103e546..26653f4 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResendTest.java @@ -30,8 +30,8 @@ import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.MimeMessage; -import org.apache.james.dnsservice.api.DNSService; import org.apache.james.core.MailAddress; +import org.apache.james.dnsservice.api.DNSService; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMailContext; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java index 05202af..30064ab 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ResourceLocatorTest.java @@ -23,17 +23,17 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +import org.apache.james.core.MailAddress; import org.apache.james.sieverepository.api.SieveRepository; import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; import org.apache.james.transport.mailets.jsieve.ResourceLocator; import org.apache.james.user.api.UsersRepository; -import org.apache.james.core.MailAddress; import org.junit.Before; import org.junit.Test; -import java.io.ByteArrayInputStream; -import java.io.InputStream; - public class ResourceLocatorTest { public static final String RECEIVER_LOCALHOST = "receiver@localhost"; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java index fa1e5a3..336e2a1 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/AddressExtractorTest.java @@ -22,8 +22,10 @@ package org.apache.james.transport.mailets.redirect; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; + import java.util.List; import java.util.Optional; + import javax.mail.MessagingException; import org.apache.james.core.MailAddress; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/LoadedOnceInitParametersTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/LoadedOnceInitParametersTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/LoadedOnceInitParametersTest.java index 7e23e47..c989a5e 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/LoadedOnceInitParametersTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/LoadedOnceInitParametersTest.java @@ -20,6 +20,7 @@ package org.apache.james.transport.mailets.redirect; 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/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java index 187847f..d04ba88 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/MailModifierTest.java @@ -20,8 +20,8 @@ package org.apache.james.transport.mailets.redirect; import static org.mockito.Mockito.mock; -import org.apache.james.server.core.MailImpl; import org.apache.james.dnsservice.api.DNSService; +import org.apache.james.server.core.MailImpl; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetInitParametersTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetInitParametersTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetInitParametersTest.java index b36608d..a0dfb17 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetInitParametersTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetInitParametersTest.java @@ -20,7 +20,9 @@ package org.apache.james.transport.mailets.redirect; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Optional; + import javax.mail.MessagingException; import org.apache.mailet.Mail; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java index 951e93c..ed73a91 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java @@ -33,7 +33,6 @@ import javax.mail.MessagingException; import javax.mail.Session; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import javax.mail.internet.MimeUtility; import org.apache.james.core.MailAddress; import org.apache.mailet.Mail; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java index 039e5da..208bd35 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/RedirectMailetInitParametersTest.java @@ -20,7 +20,9 @@ package org.apache.james.transport.mailets.redirect; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Optional; + import javax.mail.MessagingException; import org.apache.mailet.Mail; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverterTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverterTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverterTest.java index e706e58..df7e94c 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverterTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/AddressesArrayToMailAddressListConverterTest.java @@ -20,6 +20,7 @@ package org.apache.james.transport.mailets.remoteDelivery; import static org.assertj.core.api.Assertions.assertThat; + import javax.mail.Address; import javax.mail.internet.InternetAddress; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java index 4066c5f..6b773f9 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/BouncerTest.java @@ -22,10 +22,12 @@ package org.apache.james.transport.mailets.remoteDelivery; import static org.apache.james.transport.mailets.remoteDelivery.Bouncer.DELIVERY_ERROR; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; + import java.net.ConnectException; import java.net.SocketException; import java.net.UnknownHostException; import java.util.Optional; + import javax.mail.MessagingException; import javax.mail.SendFailedException; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java index 2575db3..768b1b4 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/DeliveryRunnableTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; + import java.util.Date; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/HeloNameProviderTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/HeloNameProviderTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/HeloNameProviderTest.java index 987b99b..e1ef9eb 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/HeloNameProviderTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remoteDelivery/HeloNameProviderTest.java @@ -19,8 +19,8 @@ package org.apache.james.transport.mailets.remoteDelivery; -import static org.mockito.Mockito.mock; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.apache.james.domainlist.api.DomainList; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java index ac631ed..0f87010 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java @@ -26,8 +26,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.james.dnsservice.api.mock.MockDNSService; import org.apache.james.core.MailAddress; +import org.apache.james.dnsservice.api.mock.MockDNSService; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java index f08db89..3adf2c4 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java @@ -26,8 +26,8 @@ import java.util.Collection; import javax.mail.MessagingException; -import org.apache.james.dnsservice.api.mock.MockDNSService; import org.apache.james.core.MailAddress; +import org.apache.james.dnsservice.api.mock.MockDNSService; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java index 4f1e862..d64b322 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/MailAddressUtilsTest.java @@ -24,8 +24,8 @@ import java.util.List; import javax.mail.internet.InternetAddress; -import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.james.core.MailAddress; +import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java index 380bcf8..a993fa9 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java @@ -29,9 +29,9 @@ import javax.mail.Session; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage.RecipientType; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java index 5776782..dcf4833 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/ReplyToUtilsTest.java @@ -19,10 +19,11 @@ package org.apache.james.transport.util; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Optional; -import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.james.core.MailAddress; +import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.base.test.FakeMail; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java index fa0627e..cde6b4e 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SenderUtilsTest.java @@ -19,10 +19,11 @@ package org.apache.james.transport.util; import static org.assertj.core.api.Assertions.assertThat; + import java.util.Optional; -import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.james.core.MailAddress; +import org.apache.james.transport.mailets.redirect.SpecialAddress; import org.apache.mailet.base.test.FakeMail; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java index b17b967..91a007c 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SizeUtilsTest.java @@ -19,11 +19,11 @@ package org.apache.james.transport.util; -import org.junit.Test; - import static org.apache.james.transport.util.SizeUtils.humanReadableSize; import static org.assertj.core.api.Assertions.assertThat; +import org.junit.Test; + public class SizeUtilsTest { @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java index 8871ef3..b7d50c8 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/SpecialAddressesUtilsTest.java @@ -21,17 +21,19 @@ package org.apache.james.transport.util; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; + import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.Properties; + import javax.mail.Session; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.james.core.MailAddress; import org.apache.mailet.MailetContext; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.RFC2822Headers; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java index 8afc99d..ff229ef 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java @@ -30,9 +30,9 @@ import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage.RecipientType; +import org.apache.james.core.MailAddress; import org.apache.james.transport.mailets.redirect.RedirectNotify; import org.apache.james.transport.mailets.redirect.SpecialAddress; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.test.FakeMail; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java index 53f61de..b9ad415 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/MessageProcessor.java @@ -32,11 +32,11 @@ import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import javax.mail.internet.ParseException; -import org.apache.james.server.core.MailImpl; +import org.apache.james.core.MailAddress; import org.apache.james.domainlist.api.DomainListException; +import org.apache.james.server.core.MailImpl; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.RFC2822Headers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java index 1af2f6c..9a62259 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java @@ -28,12 +28,12 @@ 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.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.queue.api.MailQueue; import org.apache.james.user.api.UsersRepository; -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/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java index 9ffc884..ec67ace 100644 --- a/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java +++ b/server/protocols/fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java @@ -25,10 +25,10 @@ import java.util.Set; import javax.mail.MessagingException; import javax.mail.Session; +import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.queue.api.MailQueue; import org.apache.james.user.api.UsersRepository; -import org.apache.james.core.MailAddress; /** * <p> http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/UserProvisionningConcurrencyTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/UserProvisionningConcurrencyTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/UserProvisionningConcurrencyTest.java index e1a22e1..701dc9d 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/UserProvisionningConcurrencyTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/UserProvisionningConcurrencyTest.java @@ -34,8 +34,8 @@ import java.util.concurrent.TimeUnit; import org.apache.http.client.utils.URIBuilder; import org.apache.james.GuiceJamesServer; import org.apache.james.util.concurrency.ConcurrentTestRunner; -import org.apache.james.utils.JmapGuiceProbe; import org.apache.james.utils.DataProbeImpl; +import org.apache.james.utils.JmapGuiceProbe; 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/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java index 7b6c2a3..2eb754c 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java @@ -41,8 +41,8 @@ import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.store.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; import org.apache.james.probe.DataProbe; -import org.apache.james.utils.JmapGuiceProbe; import org.apache.james.utils.DataProbeImpl; +import org.apache.james.utils.JmapGuiceProbe; 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/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java index 34dbd0a..ef94455 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/GetVacationResponseTest.java @@ -38,8 +38,8 @@ import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.VacationPatch; import org.apache.james.probe.DataProbe; import org.apache.james.util.date.ZonedDateTimeProvider; -import org.apache.james.utils.JmapGuiceProbe; import org.apache.james.utils.DataProbeImpl; +import org.apache.james.utils.JmapGuiceProbe; 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/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java index 27cc151..3bc81a6 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SetVacationResponseTest.java @@ -37,8 +37,8 @@ import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.Vacation; import org.apache.james.jmap.api.vacation.VacationPatch; import org.apache.james.util.ValuePatch; -import org.apache.james.utils.JmapGuiceProbe; import org.apache.james.utils.DataProbeImpl; +import org.apache.james.utils.JmapGuiceProbe; 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/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySharingTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySharingTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySharingTest.java index 767a26a..3702e3f 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySharingTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemorySharingTest.java @@ -19,9 +19,10 @@ package org.apache.james.jmap.memory.cucumber; +import org.junit.runner.RunWith; + import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; -import org.junit.runner.RunWith; @RunWith(Cucumber.class) @CucumberOptions(features = { http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/jmap/src/main/java/org/apache/james/jmap/UserProvisioningFilter.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/UserProvisioningFilter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/UserProvisioningFilter.java index 043a363..5898fb7 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/UserProvisioningFilter.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/UserProvisioningFilter.java @@ -31,6 +31,7 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.apache.james.core.MailAddress; import org.apache.james.mailbox.MailboxSession; import org.apache.james.mailbox.MailboxSession.User; import org.apache.james.metrics.api.MetricFactory; @@ -38,7 +39,6 @@ import org.apache.james.metrics.api.TimeMetric; import org.apache.james.user.api.AlreadyExistInUsersRepositoryException; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; -import org.apache.james.core.MailAddress; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/FieldNamePropertyFilter.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/FieldNamePropertyFilter.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/FieldNamePropertyFilter.java index 5364e72..28e1d07 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/FieldNamePropertyFilter.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/json/FieldNamePropertyFilter.java @@ -19,7 +19,6 @@ package org.apache.james.jmap.json; - import java.util.function.Predicate; import com.fasterxml.jackson.databind.ser.PropertyWriter; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java index 53475c5..51100aa 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/SentByJmap.java @@ -23,9 +23,9 @@ package org.apache.james.jmap.mailet; import java.util.Collection; +import org.apache.james.core.MailAddress; import org.apache.james.jmap.send.MailMetadata; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.GenericMatcher; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/james-project/blob/43fdedc3/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationMailet.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationMailet.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationMailet.java index 1f47b14..f8a6253 100644 --- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationMailet.java +++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/mailet/VacationMailet.java @@ -26,6 +26,7 @@ import java.util.function.Function; import javax.inject.Inject; import javax.mail.MessagingException; +import org.apache.james.core.MailAddress; import org.apache.james.jmap.api.vacation.AccountId; import org.apache.james.jmap.api.vacation.NotificationRegistry; import org.apache.james.jmap.api.vacation.RecipientId; @@ -35,7 +36,6 @@ import org.apache.james.jmap.utils.MimeMessageBodyGenerator; import org.apache.james.util.CompletableFutureUtil; import org.apache.james.util.date.ZonedDateTimeProvider; import org.apache.mailet.Mail; -import org.apache.james.core.MailAddress; import org.apache.mailet.base.AutomaticallySentMailDetector; import org.apache.mailet.base.GenericMailet; import org.slf4j.Logger; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
