JAMES-2513 Disable DomainList localhost translation when autoDetect is false
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5bb6ddec Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5bb6ddec Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5bb6ddec Branch: refs/heads/master Commit: 5bb6ddeccd2756c8e189a043ba959cdbf7f1b14d Parents: 8daad38 Author: benwa <btell...@linagora.com> Authored: Thu Aug 2 16:46:07 2018 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Fri Aug 3 15:51:29 2018 +0700 ---------------------------------------------------------------------- .../apache/james/domainlist/lib/AbstractDomainList.java | 2 +- .../lib/AbstractDomainListPrivateMethodsTest.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/5bb6ddec/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java index e27ed5e..6c67045 100644 --- a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java +++ b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java @@ -126,7 +126,7 @@ public abstract class AbstractDomainList implements DomainList, Configurable { } private boolean mayChangeDefaultDomain() { - return Domain.LOCALHOST.equals(defaultDomain); + return autoDetect && Domain.LOCALHOST.equals(defaultDomain); } private void setDefaultDomain(Domain defaultDomain) throws DomainListException { http://git-wip-us.apache.org/repos/asf/james-project/blob/5bb6ddec/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java index 4ecd689..96a59ae 100644 --- a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java +++ b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListPrivateMethodsTest.java @@ -306,4 +306,14 @@ public class AbstractDomainListPrivateMethodsTest { assertThat(domainList.getDomains()).contains(domain1, domain2); } + @Test + public void configureShouldNotAttemptToChangeLocalHostDefaultDomainWhenNoAutoDetect() throws Exception { + domainList.configure(DomainListConfiguration.builder() + .autoDetect(false) + .autoDetectIp(false) + .defaultDomain(Domain.LOCALHOST)); + + assertThat(domainList.getDefaultDomain()).isEqualTo(Domain.LOCALHOST); + } + } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org