You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2018/04/25 08:55:40 UTC

[21/24] james-project git commit: JAMES-2381 Add a POJO helper for DomainList configuration

JAMES-2381 Add a POJO helper for DomainList configuration


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/66a707f4
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/66a707f4
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/66a707f4

Branch: refs/heads/master
Commit: 66a707f4ff53da93a4c319c2d0f97ec81d34a216
Parents: 07c0146
Author: benwa <bt...@linagora.com>
Authored: Mon Apr 23 14:21:16 2018 +0700
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Wed Apr 25 10:54:25 2018 +0200

----------------------------------------------------------------------
 .../domainlist/lib/AbstractDomainList.java      |  38 ++---
 .../domainlist/lib/DomainListConfiguration.java | 165 +++++++++++++++++++
 .../AbstractDomainListPrivateMethodsTest.java   |  96 +++++------
 .../domainlist/memory/MemoryDomainList.java     |   4 -
 .../impl/JamesMailetContextTest.java            |  23 ++-
 .../james/smtpserver/ValidRcptHandlerTest.java  |   5 +-
 6 files changed, 243 insertions(+), 88 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/66a707f4/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 2c59efd..4707528 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
@@ -32,7 +32,6 @@ import org.apache.james.dnsservice.api.DNSService;
 import org.apache.james.domainlist.api.DomainList;
 import org.apache.james.domainlist.api.DomainListException;
 import org.apache.james.lifecycle.api.Configurable;
-import org.apache.james.util.StreamUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -75,25 +74,25 @@ public abstract class AbstractDomainList implements DomainList, Configurable {
 
     @Override
     public void configure(HierarchicalConfiguration config) throws ConfigurationException {
-        setAutoDetect(config.getBoolean(CONFIGURE_AUTODETECT, true));
-        setAutoDetectIP(config.getBoolean(CONFIGURE_AUTODETECT_IP, true));
+        DomainListConfiguration domainListConfiguration = DomainListConfiguration.from(config);
 
-        configureDefaultDomain(config);
+        configure(domainListConfiguration);
+    }
+
+    public void configure(DomainListConfiguration domainListConfiguration) throws ConfigurationException {
+        setAutoDetect(domainListConfiguration.isAutoDetect());
+        setAutoDetectIP(domainListConfiguration.isAutoDetectIp());
+
+        configureDefaultDomain(domainListConfiguration.getDefaultDomain());
 
         addEnvDomain();
-        addConfiguredDomains(config);
+        addConfiguredDomains(domainListConfiguration.getConfiguredDomains());
     }
 
-    protected void addConfiguredDomains(HierarchicalConfiguration config) {
-        StreamUtils.ofNullable(config.getStringArray(CONFIGURE_DOMAIN_NAMES))
-            .filter(s -> !s.isEmpty())
-            .map(Domain::of)
-            .forEach(
-                Throwing.consumer((Domain domain) -> {
-                    if (!containsDomainInternal(domain)) {
-                        addDomain(domain);
-                    }
-                }).sneakyThrow());
+    protected void addConfiguredDomains(List<Domain> domains) {
+        domains.stream()
+            .filter(Throwing.predicate((Domain domain) -> !containsDomainInternal(domain)).sneakyThrow())
+            .forEach(Throwing.consumer(this::addDomain).sneakyThrow());
     }
 
 
@@ -109,12 +108,9 @@ public abstract class AbstractDomainList implements DomainList, Configurable {
         }
     }
 
-    @VisibleForTesting void configureDefaultDomain(HierarchicalConfiguration config) throws ConfigurationException {
+    @VisibleForTesting void configureDefaultDomain(Domain defaultDomain) throws ConfigurationException {
         try {
-            Optional.ofNullable(
-                config.getString(CONFIGURE_DEFAULT_DOMAIN, Domain.LOCALHOST.asString()))
-                .map(Domain::of)
-                .ifPresent(Throwing.consumer(this::setDefaultDomain).sneakyThrow());
+            setDefaultDomain(defaultDomain);
 
             String hostName = InetAddress.getLocalHost().getHostName();
             if (mayChangeDefaultDomain()) {
@@ -131,7 +127,7 @@ public abstract class AbstractDomainList implements DomainList, Configurable {
         return Domain.LOCALHOST.equals(defaultDomain);
     }
 
-    protected void setDefaultDomain(Domain defaultDomain) throws DomainListException {
+    private void setDefaultDomain(Domain defaultDomain) throws DomainListException {
         if (defaultDomain != null && !containsDomain(defaultDomain)) {
             addDomain(defaultDomain);
         }

http://git-wip-us.apache.org/repos/asf/james-project/blob/66a707f4/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListConfiguration.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListConfiguration.java b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListConfiguration.java
new file mode 100644
index 0000000..8302b3f
--- /dev/null
+++ b/server/data/data-library/src/main/java/org/apache/james/domainlist/lib/DomainListConfiguration.java
@@ -0,0 +1,165 @@
+/****************************************************************
+ * 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.domainlist.lib;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.james.core.Domain;
+import org.apache.james.util.StreamUtils;
+
+import com.github.steveash.guavate.Guavate;
+import com.google.common.collect.ImmutableList;
+
+public class DomainListConfiguration {
+    public static class Builder {
+        private Optional<Boolean> autoDetectIp;
+        private Optional<Boolean> autoDetect;
+        private Optional<Domain> defaultDomain;
+        private ImmutableList.Builder<Domain> configuredDomains;
+
+        public Builder() {
+            autoDetectIp = Optional.empty();
+            autoDetect = Optional.empty();
+            defaultDomain = Optional.empty();
+            configuredDomains = ImmutableList.builder();
+        }
+
+        public Builder defaultDomain(Domain defaultDomain) {
+            this.defaultDomain = Optional.of(defaultDomain);
+            return this;
+        }
+
+        public Builder autoDetect(boolean autoDetect) {
+            this.autoDetect = Optional.of(autoDetect);
+            return this;
+        }
+
+        public Builder autoDetectIp(boolean autoDetectIp) {
+            this.autoDetectIp = Optional.of(autoDetectIp);
+            return this;
+        }
+
+        public Builder defaultDomain(Optional<Domain> defaultDomain) {
+            this.defaultDomain = defaultDomain;
+            return this;
+        }
+
+        public Builder autoDetect(Optional<Boolean> autoDetect) {
+            this.autoDetect = autoDetect;
+            return this;
+        }
+
+        public Builder autoDetectIp(Optional<Boolean> autoDetectIp) {
+            this.autoDetectIp = autoDetectIp;
+            return this;
+        }
+
+        public Builder addConfiguredDomain(Domain domain) {
+            this.configuredDomains.add(domain);
+            return this;
+        }
+
+        public Builder addConfiguredDomains(Collection<Domain> domains) {
+            this.configuredDomains.addAll(domains);
+            return this;
+        }
+
+        public DomainListConfiguration build() {
+            return new DomainListConfiguration(
+                autoDetectIp.orElse(true),
+                autoDetect.orElse(true),
+                defaultDomain.orElse(Domain.LOCALHOST),
+                configuredDomains.build());
+        }
+    }
+
+    public static final String CONFIGURE_AUTODETECT = "autodetect";
+    public static final String CONFIGURE_AUTODETECT_IP = "autodetectIP";
+    public static final String CONFIGURE_DEFAULT_DOMAIN = "defaultDomain";
+    public static final String CONFIGURE_DOMAIN_NAMES = "domainnames.domainname";
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static DomainListConfiguration from(HierarchicalConfiguration config) {
+        ImmutableList<Domain> configuredDomains = StreamUtils.ofNullable(config.getStringArray(CONFIGURE_DOMAIN_NAMES))
+            .filter(s -> !s.isEmpty())
+            .map(Domain::of)
+            .collect(Guavate.toImmutableList());
+
+        return builder()
+            .autoDetect(Optional.ofNullable(config.getBoolean(CONFIGURE_AUTODETECT, null)))
+            .autoDetectIp(Optional.ofNullable(config.getBoolean(CONFIGURE_AUTODETECT_IP, null)))
+            .defaultDomain(Optional.ofNullable(config.getString(CONFIGURE_DEFAULT_DOMAIN, null))
+                .map(Domain::of))
+            .addConfiguredDomains(configuredDomains)
+            .build();
+    }
+
+    private final boolean autoDetectIp;
+    private final boolean autoDetect;
+    private final Domain defaultDomain;
+    private final List<Domain> configuredDomains;
+
+    public DomainListConfiguration(boolean autoDetectIp, boolean autoDetect, Domain defaultDomain, List<Domain> configuredDomains) {
+        this.autoDetectIp = autoDetectIp;
+        this.autoDetect = autoDetect;
+        this.defaultDomain = defaultDomain;
+        this.configuredDomains = configuredDomains;
+    }
+
+    public boolean isAutoDetectIp() {
+        return autoDetectIp;
+    }
+
+    public boolean isAutoDetect() {
+        return autoDetect;
+    }
+
+    public Domain getDefaultDomain() {
+        return defaultDomain;
+    }
+
+    public List<Domain> getConfiguredDomains() {
+        return configuredDomains;
+    }
+
+    @Override
+    public final boolean equals(Object o) {
+        if (o instanceof DomainListConfiguration) {
+            DomainListConfiguration that = (DomainListConfiguration) o;
+
+            return Objects.equals(this.autoDetectIp, that.autoDetectIp)
+                && Objects.equals(this.autoDetect, that.autoDetect)
+                && Objects.equals(this.defaultDomain, that.defaultDomain);
+        }
+        return false;
+    }
+
+    @Override
+    public final int hashCode() {
+        return Objects.hash(autoDetectIp, autoDetect, defaultDomain);
+    }
+}

http://git-wip-us.apache.org/repos/asf/james-project/blob/66a707f4/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 a2ccf9f..ad50f8b 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
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.when;
 import java.net.InetAddress;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -84,87 +85,68 @@ public class AbstractDomainListPrivateMethodsTest {
 
     @Test
     public void setDefaultDomainShouldSetFromConfigurationWhenDifferentFromLocalhost() throws Exception {
-        HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
         String expectedDefaultDomain = "myDomain.org";
-        when(configuration.getString(AbstractDomainList.CONFIGURE_DEFAULT_DOMAIN, Domain.LOCALHOST.asString()))
-            .thenReturn(expectedDefaultDomain);
 
-        domainList.configureDefaultDomain(configuration);
+        domainList.configureDefaultDomain(Domain.of(expectedDefaultDomain));
 
         assertThat(domainList.getDefaultDomain()).isEqualTo(Domain.of(expectedDefaultDomain));
     }
 
     @Test
     public void setDefaultDomainShouldSetFromHostnameWhenEqualsToLocalhost() throws Exception {
-        HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
-        when(configuration.getString(AbstractDomainList.CONFIGURE_DEFAULT_DOMAIN, Domain.LOCALHOST.asString()))
-            .thenReturn(Domain.LOCALHOST.asString());
-
         Domain expectedDefaultDomain = Domain.of(InetAddress.getLocalHost().getHostName());
-        domainList.configureDefaultDomain(configuration);
+        domainList.configureDefaultDomain(Domain.LOCALHOST);
 
         assertThat(domainList.getDefaultDomain()).isEqualTo(expectedDefaultDomain);
     }
 
     @Test
     public void setDefaultDomainShouldCreateFromHostnameWhenEqualsToLocalhost() throws Exception {
-        HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
-        when(configuration.getString(AbstractDomainList.CONFIGURE_DEFAULT_DOMAIN, Domain.LOCALHOST.asString()))
-            .thenReturn(Domain.LOCALHOST.asString());
-
         Domain expectedDefaultDomain = Domain.of(InetAddress.getLocalHost().getHostName());
-        domainList.configureDefaultDomain(configuration);
+        domainList.configureDefaultDomain(expectedDefaultDomain);
 
         assertThat(domainList.getDomainListInternal()).contains(expectedDefaultDomain);
     }
 
     @Test
     public void setDefaultDomainShouldNotCreateTwiceWhenCallingTwoTimes() throws Exception {
-        HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
-        when(configuration.getString(AbstractDomainList.CONFIGURE_DEFAULT_DOMAIN, Domain.LOCALHOST.asString()))
-            .thenReturn(Domain.LOCALHOST.asString());
-
         Domain expectedDefaultDomain = Domain.of(InetAddress.getLocalHost().getHostName());
-        domainList.configureDefaultDomain(configuration);
-        domainList.configureDefaultDomain(configuration);
+        domainList.configureDefaultDomain(expectedDefaultDomain);
+        domainList.configureDefaultDomain(expectedDefaultDomain);
 
         assertThat(domainList.getDomainListInternal()).containsOnlyOnce(expectedDefaultDomain);
     }
 
     @Test
     public void setDefaultDomainShouldAddDomainWhenNotContained() throws Exception {
-        HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
-        String expectedDefaultDomain = "myDomain.org";
-        when(configuration.getString(AbstractDomainList.CONFIGURE_DEFAULT_DOMAIN, Domain.LOCALHOST.asString()))
-            .thenReturn(expectedDefaultDomain);
+        Domain expectedDefaultDomain = Domain.of("myDomain.org");
 
-        domainList.configureDefaultDomain(configuration);
+        domainList.configureDefaultDomain(expectedDefaultDomain);
 
-        assertThat(domainList.getDomainListInternal()).contains(Domain.of(expectedDefaultDomain));
+        assertThat(domainList.getDomainListInternal()).contains(expectedDefaultDomain);
     }
 
     @Test
     public void setDefaultDomainShouldNotFailWhenDomainContained() throws Exception {
-        HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
-        String expectedDefaultDomain = "myDomain.org";
-        when(configuration.getString(AbstractDomainList.CONFIGURE_DEFAULT_DOMAIN, Domain.LOCALHOST.asString()))
-            .thenReturn(expectedDefaultDomain);
+        Domain expectedDefaultDomain = Domain.of("myDomain.org");
 
-        domainList.addDomain(Domain.of(expectedDefaultDomain));
-        domainList.configureDefaultDomain(configuration);
+        domainList.addDomain(expectedDefaultDomain);
+        domainList.configureDefaultDomain(expectedDefaultDomain);
 
-        assertThat(domainList.getDomainListInternal()).contains(Domain.of(expectedDefaultDomain));
+        assertThat(domainList.getDomainListInternal()).contains(expectedDefaultDomain);
     }
 
     @Test
     public void getDomainsShouldNotDetectDomainsWhenDisabled() throws Exception {
         HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
 
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, true)).thenReturn(false);
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, true)).thenReturn(false);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, null)).thenReturn(false);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, null)).thenReturn(false);
+        String domain = "domain.tld";
+        when(configuration.getString(AbstractDomainList.CONFIGURE_DEFAULT_DOMAIN, null)).thenReturn(domain);
         domainList.configure(configuration);
 
-        assertThat(domainList.getDomains()).isEmpty();
+        assertThat(domainList.getDomains()).containsOnly(Domain.of(domain));
     }
 
     @Test
@@ -183,22 +165,22 @@ public class AbstractDomainListPrivateMethodsTest {
     public void getDomainsShouldContainDetectedDomains() throws Exception {
         HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
 
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, true)).thenReturn(true);
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, true)).thenReturn(false);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, null)).thenReturn(true);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, null)).thenReturn(false);
         domainList.configure(configuration);
 
         String detected = "detected.tld";
         when(dnsService.getHostName(any(InetAddress.class))).thenReturn(detected);
 
-        assertThat(domainList.getDomains()).containsOnly(Domain.of(detected));
+        assertThat(domainList.getDomains()).contains(Domain.of(detected));
     }
 
     @Test
     public void getDomainsShouldContainDetectedDomainsAndIps() throws Exception {
         HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
 
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, true)).thenReturn(true);
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, true)).thenReturn(true);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, null)).thenReturn(true);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, null)).thenReturn(true);
         domainList.configure(configuration);
 
         String detected = "detected.tld";
@@ -208,15 +190,15 @@ public class AbstractDomainListPrivateMethodsTest {
         when(detectedAddress.getHostAddress()).thenReturn(detectedIp);
         when(dnsService.getAllByName(detected)).thenReturn(ImmutableList.of(detectedAddress));
 
-        assertThat(domainList.getDomains()).containsOnly(Domain.of(detected), Domain.of(detectedIp));
+        assertThat(domainList.getDomains()).contains(Domain.of(detected), Domain.of(detectedIp));
     }
 
     @Test
     public void getDomainsShouldContainDetectedDomainsAndIpsOfAddedDomains() throws Exception {
         HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
 
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, true)).thenReturn(true);
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, true)).thenReturn(true);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, null)).thenReturn(true);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, null)).thenReturn(true);
         domainList.configure(configuration);
 
         String added = "added.tld";
@@ -234,20 +216,22 @@ public class AbstractDomainListPrivateMethodsTest {
 
         assertThat(domainList.getDomains())
             .extracting(Domain::name)
-            .containsOnly(detected, detectedIp1, added, detectedIp2);
+            .contains(detected, detectedIp1, added, detectedIp2);
     }
 
     @Test
     public void getDomainsShouldListAddedDomain() throws Exception {
         HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
 
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, true)).thenReturn(false);
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, true)).thenReturn(false);
+        Domain defaultDomain = Domain.of("default.tld");
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, null)).thenReturn(false);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, null)).thenReturn(false);
+        when(configuration.getString(AbstractDomainList.CONFIGURE_DEFAULT_DOMAIN, null)).thenReturn(defaultDomain.asString());
         Domain domain = Domain.of("added.tld");
         domainList.addDomain(domain);
         domainList.configure(configuration);
 
-        assertThat(domainList.getDomains()).containsOnly(domain);
+        assertThat(domainList.getDomains()).containsOnly(domain, defaultDomain);
     }
 
     @Test
@@ -303,8 +287,8 @@ public class AbstractDomainListPrivateMethodsTest {
     public void containsDomainShouldReturnDetectedDomains() throws Exception {
         HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
 
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, true)).thenReturn(true);
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, true)).thenReturn(false);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, null)).thenReturn(true);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, null)).thenReturn(false);
         domainList.configure(configuration);
 
         String detected = "detected.tld";
@@ -328,16 +312,20 @@ public class AbstractDomainListPrivateMethodsTest {
 
     @Test
     public void configuredDomainShouldBeAddedUponConfiguration() throws Exception {
-        String[] configuredDomain = new String[] {"conf1.tld", "conf2.tld"};
+        String domain1 = "conf1.tld";
+        String domain2 = "conf2.tld";
+        String[] configuredDomain = new String[] {domain1, domain2};
 
         HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, true)).thenReturn(true);
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, true)).thenReturn(false);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, null)).thenReturn(true);
+        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, null)).thenReturn(false);
         when(configuration.getStringArray(AbstractDomainList.CONFIGURE_DOMAIN_NAMES)).thenReturn(configuredDomain);
         domainList.configure(configuration);
 
         assertThat(domainList.getDomains())
-            .containsOnlyElementsOf(Arrays.stream(configuredDomain).map(Domain::of).collect(Collectors.toList()));
+            .contains(
+                Domain.of(domain1),
+                Domain.of(domain2));
     }
 
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/66a707f4/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java b/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
index c1a1cfc..39d5835 100644
--- a/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
+++ b/server/data/data-memory/src/main/java/org/apache/james/domainlist/memory/MemoryDomainList.java
@@ -73,8 +73,4 @@ public class MemoryDomainList extends AbstractDomainList {
             throw new DomainListException(domain.name() + " was not found");
         }
     }
-
-    public void setDefaultDomain(Domain defaultDomain) throws DomainListException {
-        super.setDefaultDomain(defaultDomain);
-    }
 }

http://git-wip-us.apache.org/repos/asf/james-project/blob/66a707f4/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
index 70b0693..f4bd07d 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/impl/JamesMailetContextTest.java
@@ -29,12 +29,11 @@ import java.util.concurrent.TimeUnit;
 
 import javax.mail.internet.MimeMessage;
 
-import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.james.core.Domain;
 import org.apache.james.core.MailAddress;
 import org.apache.james.core.builder.MimeMessageBuilder;
 import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.domainlist.lib.AbstractDomainList;
+import org.apache.james.domainlist.lib.DomainListConfiguration;
 import org.apache.james.domainlist.memory.MemoryDomainList;
 import org.apache.james.queue.api.MailQueue;
 import org.apache.james.queue.api.MailQueueFactory;
@@ -70,10 +69,10 @@ public class JamesMailetContextTest {
     @SuppressWarnings("unchecked")
     public void setUp() throws Exception {
         domainList = new MemoryDomainList(DNS_SERVICE);
-        HierarchicalConfiguration configuration = mock(HierarchicalConfiguration.class);
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT, true)).thenReturn(false);
-        when(configuration.getBoolean(AbstractDomainList.CONFIGURE_AUTODETECT_IP, true)).thenReturn(false);
-        domainList.configure(configuration);
+        domainList.configure(DomainListConfiguration.builder()
+            .autoDetect(false)
+            .autoDetectIp(false)
+            .build());
 
         usersRepository = MemoryUsersRepository.withVirtualHosting();
         usersRepository.setDomainList(domainList);
@@ -114,7 +113,11 @@ public class JamesMailetContextTest {
 
     @Test
     public void isLocalUserShouldReturnTrueWhenUsedWithLocalPartAndUserExistOnDefaultDomain() throws Exception {
-        domainList.setDefaultDomain(DOMAIN_COM);
+        domainList.configure(DomainListConfiguration.builder()
+            .autoDetect(false)
+            .autoDetectIp(false)
+            .defaultDomain(DOMAIN_COM)
+            .build());
 
         usersRepository.addUser(USERMAIL, PASSWORD);
 
@@ -123,7 +126,11 @@ public class JamesMailetContextTest {
 
     @Test
     public void isLocalUserShouldReturnFalseWhenUsedWithLocalPartAndUserDoNotExistOnDefaultDomain() throws Exception {
-        domainList.setDefaultDomain(Domain.of("any"));
+        domainList.configure(DomainListConfiguration.builder()
+            .autoDetect(false)
+            .autoDetectIp(false)
+            .defaultDomain(Domain.of("any"))
+            .build());
 
         domainList.addDomain(DOMAIN_COM);
         usersRepository.addUser(USERMAIL, PASSWORD);

http://git-wip-us.apache.org/repos/asf/james-project/blob/66a707f4/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
index b18b873..a6eed9a 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
 import org.apache.james.core.Domain;
 import org.apache.james.core.MailAddress;
 import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.domainlist.lib.DomainListConfiguration;
 import org.apache.james.domainlist.memory.MemoryDomainList;
 import org.apache.james.protocols.smtp.SMTPSession;
 import org.apache.james.protocols.smtp.hook.HookReturnCode;
@@ -59,7 +60,9 @@ public class ValidRcptHandlerTest {
         users.addUser(VALID_USER, PASSWORD);
 
         MemoryDomainList memoryDomainList = new MemoryDomainList(mock(DNSService.class));
-        memoryDomainList.setDefaultDomain(Domain.LOCALHOST);
+        memoryDomainList.configure(DomainListConfiguration.builder()
+            .defaultDomain(Domain.LOCALHOST)
+            .build());
 
         memoryRecipientRewriteTable = new MemoryRecipientRewriteTable();
         memoryRecipientRewriteTable.setDomainList(memoryDomainList);


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org