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 be27078b5e42a06f588b82f28349670efa2b3491 Author: Tran Tien Duc <[email protected]> AuthorDate: Thu Mar 5 10:28:24 2020 +0700 JAMES-3088 MemoryUsersRepository should use its parent boolean virtualHosting --- .../apache/james/user/memory/MemoryUsersRepository.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java index d7c7d53..2853514 100644 --- a/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java +++ b/server/data/data-memory/src/main/java/org/apache/james/user/memory/MemoryUsersRepository.java @@ -37,22 +37,24 @@ import org.apache.james.user.lib.model.DefaultUser; public class MemoryUsersRepository extends AbstractUsersRepository { public static MemoryUsersRepository withVirtualHosting(DomainList domainList) { - return new MemoryUsersRepository(domainList, true); + MemoryUsersRepository userRepository = new MemoryUsersRepository(domainList); + userRepository.setEnableVirtualHosting(true); + return userRepository; } public static MemoryUsersRepository withoutVirtualHosting(DomainList domainList) { - return new MemoryUsersRepository(domainList, false); + MemoryUsersRepository userRepository = new MemoryUsersRepository(domainList); + userRepository.setEnableVirtualHosting(false); + return userRepository; } private final Map<String, User> userByName; - private final boolean supportVirtualHosting; private String algo; - private MemoryUsersRepository(DomainList domainList, boolean supportVirtualHosting) { + private MemoryUsersRepository(DomainList domainList) { super(domainList); this.userByName = new HashMap<>(); this.algo = "MD5"; - this.supportVirtualHosting = supportVirtualHosting; } public void clear() { @@ -60,11 +62,6 @@ public class MemoryUsersRepository extends AbstractUsersRepository { } @Override - public boolean supportVirtualHosting() { - return supportVirtualHosting; - } - - @Override public void doConfigure(HierarchicalConfiguration<ImmutableNode> config) throws ConfigurationException { algo = config.getString("algorithm", "MD5"); super.doConfigure(config); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
