JAMES-1982 Correct injects on QuotaManagement
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fe92e8bc Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fe92e8bc Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fe92e8bc Branch: refs/heads/master Commit: fe92e8bceb6c31f584c5c48bbbcb1753066622ce Parents: b547e70 Author: benwa <btell...@linagora.com> Authored: Sat Apr 1 11:11:56 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Mon Apr 3 18:09:32 2017 +0700 ---------------------------------------------------------------------- .../james/adapter/mailbox/QuotaManagement.java | 17 +++++++---------- .../META-INF/org/apache/james/spring-server.xml | 6 +----- 2 files changed, 8 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92e8bc/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java ---------------------------------------------------------------------- diff --git a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java index dd779a3..9083ab4 100644 --- a/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java +++ b/server/container/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/QuotaManagement.java @@ -19,6 +19,8 @@ package org.apache.james.adapter.mailbox; +import javax.inject.Inject; + import org.apache.james.mailbox.exception.MailboxException; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.mailbox.quota.MaxQuotaManager; @@ -28,19 +30,14 @@ import org.apache.james.mailbox.store.mail.model.SerializableQuota; public class QuotaManagement implements QuotaManagementMBean { - private QuotaManager quotaManager; - private MaxQuotaManager maxQuotaManager; - private QuotaRootResolver quotaRootResolver; + private final QuotaManager quotaManager; + private final MaxQuotaManager maxQuotaManager; + private final QuotaRootResolver quotaRootResolver; - public void setQuotaManager(QuotaManager quotaManager) { + @Inject + public QuotaManagement(QuotaManager quotaManager, MaxQuotaManager maxQuotaManager, QuotaRootResolver quotaRootResolver) { this.quotaManager = quotaManager; - } - - public void setMaxQuotaManager(MaxQuotaManager maxQuotaManager) { this.maxQuotaManager = maxQuotaManager; - } - - public void setQuotaRootResolver(QuotaRootResolver quotaRootResolver) { this.quotaRootResolver = quotaRootResolver; } http://git-wip-us.apache.org/repos/asf/james-project/blob/fe92e8bc/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml index a08cedc..322c4c6 100644 --- a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml +++ b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml @@ -280,11 +280,7 @@ <bean id="domainlistmanagement" class="org.apache.james.domainlist.lib.DomainListManagement"/> <bean id="mailboxmanagermanagementbean" class="org.apache.james.adapter.mailbox.MailboxManagerManagement"/> <bean id="mailboxcopiermanagement" class="org.apache.james.adapter.mailbox.MailboxCopierManagement"/> - <bean id="quotamanagermanagement" class="org.apache.james.adapter.mailbox.QuotaManagement"> - <property name="maxQuotaManager" ref="maxQuotaManager"/> - <property name="quotaRootResolver" ref="quotaRootResolver"/> - <property name="quotaManager" ref="quotaManager"/> - </bean> + <bean id="quotamanagermanagement" class="org.apache.james.adapter.mailbox.QuotaManagement"/> <bean id="reindexermanagement" class="org.apache.james.adapter.mailbox.ReIndexerManagement"/> <bean id="sievemanagerbean" class="org.apache.james.sieverepository.lib.SieveRepositoryManagement"/> <!-- --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org