Repository: james-project Updated Branches: refs/heads/master 7c333a50d -> 975fcf12e
JAMES-2103 Use final fields in Quota related classes Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/797660c4 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/797660c4 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/797660c4 Branch: refs/heads/master Commit: 797660c4560dc459c1e3f0db59f4a010fc246ff9 Parents: 7c333a5 Author: benwa <btell...@linagora.com> Authored: Fri Jul 28 11:21:37 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Tue Aug 8 10:39:48 2017 +0700 ---------------------------------------------------------------------- .../manager/InMemoryIntegrationResources.java | 11 +++-------- .../src/main/resources/META-INF/spring/quota.xml | 8 ++++---- .../store/quota/ListeningCurrentQuotaUpdater.java | 12 ++++-------- .../mailbox/store/quota/StoreQuotaManager.java | 16 ++++++---------- .../quota/ListeningCurrentQuotaUpdaterTest.java | 4 +--- .../mailbox/store/quota/StoreQuotaManagerTest.java | 4 +--- .../cassandra/host/CassandraHostSystem.java | 8 ++------ .../inmemory/host/InMemoryHostSystem.java | 8 ++------ .../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 8 ++------ .../james/transport/matchers/IsOverQuotaTest.java | 5 ++--- 10 files changed, 27 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/797660c4/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java ---------------------------------------------------------------------- diff --git a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java index 240b5a7..d70e519 100644 --- a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java +++ b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java @@ -76,8 +76,6 @@ public class InMemoryIntegrationResources implements IntegrationResources { @Override public QuotaManager createQuotaManager(MaxQuotaManager maxQuotaManager, MailboxManager mailboxManager) throws Exception { - StoreQuotaManager quotaManager = new StoreQuotaManager(); - quotaManager.setCalculateWhenUnlimited(false); QuotaRootResolver quotaRootResolver = createQuotaRootResolver(mailboxManager); @@ -86,12 +84,9 @@ public class InMemoryIntegrationResources implements IntegrationResources { mailboxManager ); - ListeningCurrentQuotaUpdater listeningCurrentQuotaUpdater = new ListeningCurrentQuotaUpdater(); - listeningCurrentQuotaUpdater.setQuotaRootResolver(quotaRootResolver); - listeningCurrentQuotaUpdater.setCurrentQuotaManager(currentQuotaManager); - - quotaManager.setCurrentQuotaManager(currentQuotaManager); - quotaManager.setMaxQuotaManager(maxQuotaManager); + ListeningCurrentQuotaUpdater listeningCurrentQuotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver); + StoreQuotaManager quotaManager = new StoreQuotaManager(currentQuotaManager, maxQuotaManager); + quotaManager.setCalculateWhenUnlimited(false); ((StoreMailboxManager) mailboxManager).setQuotaManager(quotaManager); mailboxManager.addGlobalListener(listeningCurrentQuotaUpdater, null); return quotaManager; http://git-wip-us.apache.org/repos/asf/james-project/blob/797660c4/mailbox/spring/src/main/resources/META-INF/spring/quota.xml ---------------------------------------------------------------------- diff --git a/mailbox/spring/src/main/resources/META-INF/spring/quota.xml b/mailbox/spring/src/main/resources/META-INF/spring/quota.xml index 31870b3..45361d2 100644 --- a/mailbox/spring/src/main/resources/META-INF/spring/quota.xml +++ b/mailbox/spring/src/main/resources/META-INF/spring/quota.xml @@ -45,14 +45,14 @@ <bean id="noQuotaManager" class="org.apache.james.mailbox.store.quota.NoQuotaManager" lazy-init="true"/> <bean id="storeQuotaManager" class="org.apache.james.mailbox.store.quota.StoreQuotaManager" lazy-init="true"> - <property name="maxQuotaManager" ref="maxQuotaManager"/> - <property name="currentQuotaManager" ref="currentQuotaManager"/> + <constructor-arg index="0" ref="currentQuotaManager"/> + <constructor-arg index="1" ref="maxQuotaManager"/> </bean> <bean id="noQuotaUpdater" class="org.apache.james.mailbox.store.quota.NoQuotaUpdater" lazy-init="true"/> <bean id="eventQuotaUpdater" class="org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater" lazy-init="true"> - <property name="quotaRootResolver" ref="quotaRootResolver"/> - <property name="currentQuotaManager" ref="currentQuotaManager"/> + <constructor-arg index="0" ref="currentQuotaManager"/> + <constructor-arg index="1" ref="quotaRootResolver"/> </bean> </beans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/james-project/blob/797660c4/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java index 9e48071..c54b9d6 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdater.java @@ -30,17 +30,13 @@ import javax.inject.Inject; public class ListeningCurrentQuotaUpdater implements MailboxListener, QuotaUpdater { - private StoreCurrentQuotaManager currentQuotaManager; - private QuotaRootResolver quotaRootResolver; + private final StoreCurrentQuotaManager currentQuotaManager; + private final QuotaRootResolver quotaRootResolver; @Inject - public void setQuotaRootResolver(QuotaRootResolver quotaRootResolver) { - this.quotaRootResolver = quotaRootResolver; - } - - @Inject - public void setCurrentQuotaManager(StoreCurrentQuotaManager currentQuotaManager) { + public ListeningCurrentQuotaUpdater(StoreCurrentQuotaManager currentQuotaManager, QuotaRootResolver quotaRootResolver) { this.currentQuotaManager = currentQuotaManager; + this.quotaRootResolver = quotaRootResolver; } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/797660c4/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java index c1923cf..65cb3fe 100644 --- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java +++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/quota/StoreQuotaManager.java @@ -34,22 +34,18 @@ import javax.inject.Inject; * Relies on the CurrentQuotaManager and MaxQuotaManager provided. */ public class StoreQuotaManager implements QuotaManager { - private CurrentQuotaManager currentQuotaManager; - private MaxQuotaManager maxQuotaManager; + private final CurrentQuotaManager currentQuotaManager; + private final MaxQuotaManager maxQuotaManager; private boolean calculateWhenUnlimited = false; - public void setCalculateWhenUnlimited(boolean calculateWhenUnlimited) { - this.calculateWhenUnlimited = calculateWhenUnlimited; - } - @Inject - public void setMaxQuotaManager(MaxQuotaManager maxQuotaManager) { + public StoreQuotaManager(CurrentQuotaManager currentQuotaManager, MaxQuotaManager maxQuotaManager) { + this.currentQuotaManager = currentQuotaManager; this.maxQuotaManager = maxQuotaManager; } - @Inject - public void setCurrentQuotaManager(CurrentQuotaManager currentQuotaManager) { - this.currentQuotaManager = currentQuotaManager; + public void setCalculateWhenUnlimited(boolean calculateWhenUnlimited) { + this.calculateWhenUnlimited = calculateWhenUnlimited; } public Quota getMessageQuota(QuotaRoot quotaRoot) throws MailboxException { http://git-wip-us.apache.org/repos/asf/james-project/blob/797660c4/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java index 054a275..63f483a 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/ListeningCurrentQuotaUpdaterTest.java @@ -54,9 +54,7 @@ public class ListeningCurrentQuotaUpdaterTest { public void setUp() throws Exception { mockedQuotaRootResolver = mock(QuotaRootResolver.class); mockedCurrentQuotaManager = mock(StoreCurrentQuotaManager.class); - testee = new ListeningCurrentQuotaUpdater(); - testee.setCurrentQuotaManager(mockedCurrentQuotaManager); - testee.setQuotaRootResolver(mockedQuotaRootResolver); + testee = new ListeningCurrentQuotaUpdater(mockedCurrentQuotaManager, mockedQuotaRootResolver); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/797660c4/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreQuotaManagerTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreQuotaManagerTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreQuotaManagerTest.java index 0c3ac74..c7c6ccc 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreQuotaManagerTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/quota/StoreQuotaManagerTest.java @@ -46,9 +46,7 @@ public class StoreQuotaManagerTest { public void setUp() { mockedCurrentQuotaManager = mock(CurrentQuotaManager.class); mockedMaxQuotaManager = mock(MaxQuotaManager.class); - testee = new StoreQuotaManager(); - testee.setCurrentQuotaManager(mockedCurrentQuotaManager); - testee.setMaxQuotaManager(mockedMaxQuotaManager); + testee = new StoreQuotaManager(mockedCurrentQuotaManager, mockedMaxQuotaManager); quotaRoot = QuotaRootImpl.quotaRoot("benwa"); } http://git-wip-us.apache.org/repos/asf/james-project/blob/797660c4/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java index 7996745..54dc713 100644 --- a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java +++ b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java @@ -146,13 +146,9 @@ public class CassandraHostSystem extends JamesImapHostSystem { CassandraCurrentQuotaManager currentQuotaManager = new CassandraCurrentQuotaManager(session); - StoreQuotaManager quotaManager = new StoreQuotaManager(); - quotaManager.setMaxQuotaManager(perUserMaxQuotaManager); - quotaManager.setCurrentQuotaManager(currentQuotaManager); + StoreQuotaManager quotaManager = new StoreQuotaManager(currentQuotaManager, perUserMaxQuotaManager); - ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(); - quotaUpdater.setCurrentQuotaManager(currentQuotaManager); - quotaUpdater.setQuotaRootResolver(quotaRootResolver); + ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver); mailboxManager.setQuotaRootResolver(quotaRootResolver); mailboxManager.setQuotaManager(quotaManager); http://git-wip-us.apache.org/repos/asf/james-project/blob/797660c4/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java index 0394d3e..8cc1fd1 100644 --- a/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java +++ b/mpt/impl/imap-mailbox/inmemory/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java @@ -88,13 +88,9 @@ public class InMemoryHostSystem extends JamesImapHostSystem { new CurrentQuotaCalculator(mailboxManager.getMapperFactory(), quotaRootResolver), mailboxManager); - StoreQuotaManager quotaManager = new StoreQuotaManager(); - quotaManager.setMaxQuotaManager(perUserMaxQuotaManager); - quotaManager.setCurrentQuotaManager(currentQuotaManager); + StoreQuotaManager quotaManager = new StoreQuotaManager(currentQuotaManager, perUserMaxQuotaManager); - ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(); - quotaUpdater.setCurrentQuotaManager(currentQuotaManager); - quotaUpdater.setQuotaRootResolver(quotaRootResolver); + ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver); mailboxManager.setQuotaRootResolver(quotaRootResolver); mailboxManager.setQuotaManager(quotaManager); http://git-wip-us.apache.org/repos/asf/james-project/blob/797660c4/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java index c3f103a..2ba9c0c 100644 --- a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java +++ b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java @@ -98,12 +98,8 @@ public class JPAHostSystem extends JamesImapHostSystem { DefaultQuotaRootResolver quotaRootResolver = new DefaultQuotaRootResolver(mapperFactory); JpaCurrentQuotaManager currentQuotaManager = new JpaCurrentQuotaManager(entityManagerFactory); maxQuotaManager = new JPAPerUserMaxQuotaManager(entityManagerFactory); - StoreQuotaManager storeQuotaManager = new StoreQuotaManager(); - storeQuotaManager.setCurrentQuotaManager(currentQuotaManager); - storeQuotaManager.setMaxQuotaManager(maxQuotaManager); - ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(); - quotaUpdater.setCurrentQuotaManager(currentQuotaManager); - quotaUpdater.setQuotaRootResolver(quotaRootResolver); + StoreQuotaManager storeQuotaManager = new StoreQuotaManager(currentQuotaManager, maxQuotaManager); + ListeningCurrentQuotaUpdater quotaUpdater = new ListeningCurrentQuotaUpdater(currentQuotaManager, quotaRootResolver); mailboxManager.setQuotaManager(storeQuotaManager); mailboxManager.setQuotaUpdater(quotaUpdater); http://git-wip-us.apache.org/repos/asf/james-project/blob/797660c4/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java index c614555..eeb8ccd 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsOverQuotaTest.java @@ -68,10 +68,9 @@ public class IsOverQuotaTest { new InMemoryMessageId.Factory()); quotaRootResolver = new DefaultQuotaRootResolver(factory); - StoreQuotaManager quotaManager = new StoreQuotaManager(); maxQuotaManager = new InMemoryPerUserMaxQuotaManager(); - quotaManager.setMaxQuotaManager(maxQuotaManager); - quotaManager.setCurrentQuotaManager(new InMemoryCurrentQuotaManager(new CurrentQuotaCalculator(factory, quotaRootResolver), mailboxManager)); + InMemoryCurrentQuotaManager currentQuotaManager = new InMemoryCurrentQuotaManager(new CurrentQuotaCalculator(factory, quotaRootResolver), mailboxManager); + StoreQuotaManager quotaManager = new StoreQuotaManager(currentQuotaManager, maxQuotaManager); usersRepository = mock(UsersRepository.class); testee = new IsOverQuota(quotaRootResolver, quotaManager, mailboxManager, usersRepository); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
