This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 0d5a9953a70c7af6d85fa1854786c5482880b31f Author: Benoit TELLIER <[email protected]> AuthorDate: Thu Mar 12 16:06:52 2026 +0100 JAMES-4189 UsersRepository::supportVirtualHosting never throws Throwing for accessing config is a non sense that needlessly complexify the code. --- .../src/main/java/org/apache/james/user/api/UsersRepository.java | 2 +- .../java/org/apache/james/user/lib/UsersRepositoryManagement.java | 6 +----- .../java/org/apache/james/webadmin/routes/DomainQuotaRoutes.java | 7 +------ 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java index 16fabdab51..0ee3817ccf 100644 --- a/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java +++ b/server/data/data-api/src/main/java/org/apache/james/user/api/UsersRepository.java @@ -142,7 +142,7 @@ public interface UsersRepository { * * @return true or false */ - boolean supportVirtualHosting() throws UsersRepositoryException; + boolean supportVirtualHosting(); /** * Returns username to be used for a given MailAddress diff --git a/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java b/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java index 9a3a43b4b8..8ed65889fe 100644 --- a/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java +++ b/server/data/data-library/src/main/java/org/apache/james/user/lib/UsersRepositoryManagement.java @@ -123,10 +123,6 @@ public class UsersRepositoryManagement extends StandardMBean implements UsersRep @Override public boolean getVirtualHostingEnabled() throws Exception { - try { - return usersRepository.supportVirtualHosting(); - } catch (UsersRepositoryException e) { - throw new Exception(e.getMessage()); - } + return usersRepository.supportVirtualHosting(); } } 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 0c1788eead..d7876ba70e 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 @@ -31,7 +31,6 @@ import org.apache.james.core.quota.QuotaSizeLimit; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; 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.dto.ValidatedQuotaDTO; @@ -97,11 +96,7 @@ public class DomainQuotaRoutes implements Routes { } public boolean isVirtualHostingSupported() { - try { - return usersRepository.supportVirtualHosting(); - } catch (UsersRepositoryException e) { - throw new RuntimeException(e); - } + return usersRepository.supportVirtualHosting(); } public void defineUpdateQuota() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
