Repository: james-project Updated Branches: refs/heads/master 3b6c5e00d -> 131c01148
JAMES-1877 RemoteDelivery should rely on constructor injection Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/788b3931 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/788b3931 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/788b3931 Branch: refs/heads/master Commit: 788b3931e55d34f422176f6795a2ed707cbd8e87 Parents: 1cb969b Author: Benoit Tellier <btell...@linagora.com> Authored: Tue Nov 29 10:50:38 2016 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Tue Jan 10 11:37:10 2017 +0700 ---------------------------------------------------------------------- .../james/transport/mailets/RemoteDelivery.java | 39 ++++++-------------- 1 file changed, 11 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/788b3931/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 c4113b5..89a4987 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 @@ -164,8 +164,12 @@ public class RemoteDelivery extends GenericMailet implements Runnable { private static final Pattern PATTERN = Patterns.compilePatternUncheckedException(PATTERN_STRING); private static final String OUTGOING_MAILS = "outgoingMails"; - @Inject - private DNSService dnsServer; + private final DNSService dnsServer; + private final DomainList domainList; + private final MailQueueFactory queueFactory; + private final Metric outgoingMailsMetric; + private final Properties defprops; // Default properties for the JavaMail Session + private final Collection<Thread> workersThreads; /** * Flag to define verbose logging messages. @@ -225,11 +229,6 @@ public class RemoteDelivery extends GenericMailet implements Runnable { private boolean isBindUsed = false; /** - * Collection that stores all worker threads. - */ - private final Collection<Thread> workersThreads = new Vector<Thread>(); - - /** * Flag used by 'run' method to end itself. */ private volatile boolean destroyed = false; @@ -239,47 +238,32 @@ public class RemoteDelivery extends GenericMailet implements Runnable { */ private String bounceProcessor = null; - /** - * Default properties for the JavaMail Session - */ - private final Properties defprops = new Properties(); /** * The retry count dnsProblemErrors */ private int dnsProblemRetry = 0; - private MailQueueFactory queueFactory; - private MailQueue queue; private Logger logger; private boolean usePriority; - private DomainList domainList; - private boolean startTLS = false; private boolean isSSLEnable = false; - private MetricFactory metricFactory; - private Metric outgoingMailsMetric; private HeloNameProvider heloNameProvider; @Inject - public void setDomainList(DomainList domainList) { + public RemoteDelivery(DNSService dnsServer, DomainList domainList, MailQueueFactory queueFactory, MetricFactory metricFactory) { + this.dnsServer = dnsServer; this.domainList = domainList; - } - - @Inject - public void setMailQueueFactory(MailQueueFactory queueFactory) { this.queueFactory = queueFactory; - } - - @Inject - public void setMetricFactory(MetricFactory metricFactory) { - this.metricFactory = metricFactory; + this.outgoingMailsMetric = metricFactory.generate(OUTGOING_MAILS); + this.defprops = new Properties(); + this.workersThreads = new Vector<Thread>(); } /** @@ -289,7 +273,6 @@ public class RemoteDelivery extends GenericMailet implements Runnable { * @throws MessagingException on failure to initialize attributes. */ public void init() throws MessagingException { - outgoingMailsMetric = metricFactory.generate(OUTGOING_MAILS); // Set isDebug flag. isDebug = (getInitParameter("debug") == null) ? false : Boolean.valueOf(getInitParameter("debug")); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
