JAMES-2401 DomainQuotaService is not in the right package
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/91b90f0f Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/91b90f0f Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/91b90f0f Branch: refs/heads/master Commit: 91b90f0f1a02e666df9d38f5de35b97a06630432 Parents: 4c1093d Author: benwa <[email protected]> Authored: Fri May 18 16:34:57 2018 +0700 Committer: benwa <[email protected]> Committed: Fri May 18 16:41:16 2018 +0700 ---------------------------------------------------------------------- .../webadmin/routes/DomainQuotaRoutes.java | 1 + .../webadmin/routes/DomainQuotaService.java | 82 -------------------- .../webadmin/service/DomainQuotaService.java | 82 ++++++++++++++++++++ .../DomainQuotaRoutesNoVirtualHostingTest.java | 1 + .../webadmin/routes/DomainQuotaRoutesTest.java | 1 + 5 files changed, 85 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/91b90f0f/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java index a73c5d1..3360c23 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java @@ -39,6 +39,7 @@ import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.webadmin.Routes; import org.apache.james.webadmin.dto.QuotaDTO; +import org.apache.james.webadmin.service.DomainQuotaService; import org.apache.james.webadmin.utils.ErrorResponder; import org.apache.james.webadmin.utils.ErrorResponder.ErrorType; import org.apache.james.webadmin.utils.JsonExtractException; http://git-wip-us.apache.org/repos/asf/james-project/blob/91b90f0f/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaService.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaService.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaService.java deleted file mode 100644 index 08b75e4..0000000 --- a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/routes/DomainQuotaService.java +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one * - * or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the * - * "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, * - * software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * - * KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations * - * under the License. * - ****************************************************************/ - -package org.apache.james.webadmin.routes; - -import java.util.Optional; - -import javax.inject.Inject; - -import org.apache.james.core.Domain; -import org.apache.james.mailbox.exception.MailboxException; -import org.apache.james.mailbox.quota.MaxQuotaManager; -import org.apache.james.mailbox.quota.QuotaCount; -import org.apache.james.mailbox.quota.QuotaSize; -import org.apache.james.webadmin.dto.QuotaDTO; - -import com.github.fge.lambdas.Throwing; - -public class DomainQuotaService { - - private final MaxQuotaManager maxQuotaManager; - - @Inject - public DomainQuotaService(MaxQuotaManager maxQuotaManager) { - this.maxQuotaManager = maxQuotaManager; - } - - public Optional<QuotaCount> getMaxCountQuota(Domain domain) { - return maxQuotaManager.getDomainMaxMessage(domain); - } - - public void setMaxCountQuota(Domain domain, QuotaCount quotaCount) throws MailboxException { - maxQuotaManager.setDomainMaxMessage(domain, quotaCount); - } - - public void remoteMaxQuotaCount(Domain domain) throws MailboxException { - maxQuotaManager.removeDomainMaxMessage(domain); - } - - public Optional<QuotaSize> getMaxSizeQuota(Domain domain) { - return maxQuotaManager.getDomainMaxStorage(domain); - } - - public void setMaxSizeQuota(Domain domain, QuotaSize quotaSize) throws MailboxException { - maxQuotaManager.setDomainMaxStorage(domain, quotaSize); - } - - public void remoteMaxQuotaSize(Domain domain) throws MailboxException { - maxQuotaManager.removeDomainMaxStorage(domain); - } - - public QuotaDTO getQuota(Domain domain) { - return QuotaDTO - .builder() - .count(maxQuotaManager.getDomainMaxMessage(domain)) - .size(maxQuotaManager.getDomainMaxStorage(domain)) - .build(); - } - - public void defineQuota(Domain domain, QuotaDTO quota) { - quota.getCount() - .ifPresent(Throwing.consumer(count -> maxQuotaManager.setDomainMaxMessage(domain, count))); - quota.getSize() - .ifPresent(Throwing.consumer(size -> maxQuotaManager.setDomainMaxStorage(domain, size))); - } -} http://git-wip-us.apache.org/repos/asf/james-project/blob/91b90f0f/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/DomainQuotaService.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/DomainQuotaService.java b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/DomainQuotaService.java new file mode 100644 index 0000000..c0ad607 --- /dev/null +++ b/server/protocols/webadmin/webadmin-mailbox/src/main/java/org/apache/james/webadmin/service/DomainQuotaService.java @@ -0,0 +1,82 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.webadmin.service; + +import java.util.Optional; + +import javax.inject.Inject; + +import org.apache.james.core.Domain; +import org.apache.james.mailbox.exception.MailboxException; +import org.apache.james.mailbox.quota.MaxQuotaManager; +import org.apache.james.mailbox.quota.QuotaCount; +import org.apache.james.mailbox.quota.QuotaSize; +import org.apache.james.webadmin.dto.QuotaDTO; + +import com.github.fge.lambdas.Throwing; + +public class DomainQuotaService { + + private final MaxQuotaManager maxQuotaManager; + + @Inject + public DomainQuotaService(MaxQuotaManager maxQuotaManager) { + this.maxQuotaManager = maxQuotaManager; + } + + public Optional<QuotaCount> getMaxCountQuota(Domain domain) { + return maxQuotaManager.getDomainMaxMessage(domain); + } + + public void setMaxCountQuota(Domain domain, QuotaCount quotaCount) throws MailboxException { + maxQuotaManager.setDomainMaxMessage(domain, quotaCount); + } + + public void remoteMaxQuotaCount(Domain domain) throws MailboxException { + maxQuotaManager.removeDomainMaxMessage(domain); + } + + public Optional<QuotaSize> getMaxSizeQuota(Domain domain) { + return maxQuotaManager.getDomainMaxStorage(domain); + } + + public void setMaxSizeQuota(Domain domain, QuotaSize quotaSize) throws MailboxException { + maxQuotaManager.setDomainMaxStorage(domain, quotaSize); + } + + public void remoteMaxQuotaSize(Domain domain) throws MailboxException { + maxQuotaManager.removeDomainMaxStorage(domain); + } + + public QuotaDTO getQuota(Domain domain) { + return QuotaDTO + .builder() + .count(maxQuotaManager.getDomainMaxMessage(domain)) + .size(maxQuotaManager.getDomainMaxStorage(domain)) + .build(); + } + + public void defineQuota(Domain domain, QuotaDTO quota) { + quota.getCount() + .ifPresent(Throwing.consumer(count -> maxQuotaManager.setDomainMaxMessage(domain, count))); + quota.getSize() + .ifPresent(Throwing.consumer(size -> maxQuotaManager.setDomainMaxStorage(domain, size))); + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/91b90f0f/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java index bfca198..0700cef 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesNoVirtualHostingTest.java @@ -31,6 +31,7 @@ import org.apache.james.user.memory.MemoryUsersRepository; import org.apache.james.webadmin.WebAdminServer; import org.apache.james.webadmin.WebAdminUtils; import org.apache.james.webadmin.jackson.QuotaModule; +import org.apache.james.webadmin.service.DomainQuotaService; import org.apache.james.webadmin.utils.JsonTransformer; import org.eclipse.jetty.http.HttpStatus; import org.junit.jupiter.api.AfterEach; http://git-wip-us.apache.org/repos/asf/james-project/blob/91b90f0f/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java index 2e96dda..5c4ae39 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java @@ -37,6 +37,7 @@ import org.apache.james.user.memory.MemoryUsersRepository; import org.apache.james.webadmin.WebAdminServer; import org.apache.james.webadmin.WebAdminUtils; import org.apache.james.webadmin.jackson.QuotaModule; +import org.apache.james.webadmin.service.DomainQuotaService; import org.apache.james.webadmin.utils.JsonTransformer; import org.eclipse.jetty.http.HttpStatus; import org.junit.jupiter.api.AfterEach; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
