JAMESâ1589 Fix tests for JamesMailetContext
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f1aae405 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f1aae405 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f1aae405 Branch: refs/heads/master Commit: f1aae405651c7582ea1149accfd968093177b2bc Parents: 94ee9bd Author: benwa <btell...@linagora.com> Authored: Mon Jul 31 08:15:20 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Tue Aug 8 17:10:13 2017 +0700 ---------------------------------------------------------------------- .../META-INF/org/apache/james/spring-server.xml | 2 -- .../domainlist/cassandra/CassandraDomainList.java | 12 +++++------- .../james/domainlist/xml/XMLDomainList.java | 5 ++--- .../james/domainlist/xml/XMLDomainListTest.java | 18 +++++++++--------- .../james/domainlist/hbase/HBaseDomainList.java | 5 ++--- .../domainlist/hbase/HBaseDomainListTest.java | 4 ++-- .../james/domainlist/jpa/JPADomainList.java | 5 ++--- .../james/domainlist/jpa/JPADomainListTest.java | 2 -- .../james/domainlist/lib/AbstractDomainList.java | 7 ++++--- .../james/domainlist/memory/MemoryDomainList.java | 5 ++--- .../domainlist/memory/MemoryDomainListTest.java | 3 +-- .../impl/JamesMailetContextTest.java | 10 +++++++--- .../james/webadmin/routes/DomainRoutesTest.java | 3 +-- 13 files changed, 37 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml ---------------------------------------------------------------------- diff --git a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml index cf5b986..322c4c6 100644 --- a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml +++ b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml @@ -316,6 +316,4 @@ <bean id="jspfLogger" class="org.apache.james.smtpserver.fastfail.SPFHandler.SPFLogger"/> - <bean id="envDetector" class="org.apache.james.domainlist.lib.EnvDetector"/> - </beans> http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java index 1619f9e..fa68266 100644 --- a/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java +++ b/server/data/data-cassandra/src/main/java/org/apache/james/domainlist/cassandra/CassandraDomainList.java @@ -19,14 +19,13 @@ package org.apache.james.domainlist.cassandra; -import static org.apache.james.domainlist.cassandra.tables.CassandraDomainsTable.TABLE_NAME; -import static org.apache.james.domainlist.cassandra.tables.CassandraDomainsTable.DOMAIN; - import static com.datastax.driver.core.querybuilder.QueryBuilder.bindMarker; import static com.datastax.driver.core.querybuilder.QueryBuilder.delete; import static com.datastax.driver.core.querybuilder.QueryBuilder.eq; import static com.datastax.driver.core.querybuilder.QueryBuilder.insertInto; import static com.datastax.driver.core.querybuilder.QueryBuilder.select; +import static org.apache.james.domainlist.cassandra.tables.CassandraDomainsTable.DOMAIN; +import static org.apache.james.domainlist.cassandra.tables.CassandraDomainsTable.TABLE_NAME; import java.util.List; import java.util.Locale; @@ -38,7 +37,6 @@ import org.apache.james.backends.cassandra.utils.CassandraUtils; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.domainlist.lib.AbstractDomainList; -import org.apache.james.domainlist.lib.EnvDetector; import com.datastax.driver.core.PreparedStatement; import com.datastax.driver.core.Session; @@ -54,8 +52,8 @@ public class CassandraDomainList extends AbstractDomainList { private final PreparedStatement removeStatement; @Inject - public CassandraDomainList(DNSService dnsService, EnvDetector envDetector, Session session, CassandraUtils cassandraUtils) { - super(dnsService, envDetector); + public CassandraDomainList(DNSService dnsService, Session session, CassandraUtils cassandraUtils) { + super(dnsService); this.executor = new CassandraAsyncExecutor(session); this.cassandraUtils = cassandraUtils; this.readAllStatement = prepareReadAllStatement(session); @@ -90,7 +88,7 @@ public class CassandraDomainList extends AbstractDomainList { @VisibleForTesting CassandraDomainList(DNSService dnsService, Session session) { - this(dnsService, new EnvDetector(), session, CassandraUtils.WITH_DEFAULT_CONFIGURATION); + this(dnsService, session, CassandraUtils.WITH_DEFAULT_CONFIGURATION); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java b/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java index c73590b..634e79e 100644 --- a/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java +++ b/server/data/data-file/src/main/java/org/apache/james/domainlist/xml/XMLDomainList.java @@ -31,7 +31,6 @@ import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.domainlist.lib.AbstractDomainList; -import org.apache.james.domainlist.lib.EnvDetector; import org.apache.james.lifecycle.api.Configurable; /** @@ -44,8 +43,8 @@ public class XMLDomainList extends AbstractDomainList implements Configurable { private boolean isConfigured = false; @Inject - public XMLDomainList(DNSService dns, EnvDetector envDetector) { - super(dns, envDetector); + public XMLDomainList(DNSService dns) { + super(dns); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/server/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java b/server/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java index 4f0207d..448579b 100644 --- a/server/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java +++ b/server/data/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java @@ -26,18 +26,18 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.google.common.collect.ImmutableList; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.mock.MockDNSService; import org.apache.james.domainlist.api.DomainListException; -import org.apache.james.domainlist.lib.EnvDetector; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.slf4j.LoggerFactory; +import com.google.common.collect.ImmutableList; + public class XMLDomainListTest { public static final String DEFAULT_DOMAIN = "default.domain"; @@ -81,7 +81,7 @@ public class XMLDomainListTest { @Test public void testNoConfiguredDomains() throws Exception { List<String> domains = new ArrayList<String>(); - XMLDomainList dom = new XMLDomainList(setUpDNSServer("localhost"), new EnvDetector()); + XMLDomainList dom = new XMLDomainList(setUpDNSServer("localhost")); dom.setLog(LoggerFactory.getLogger("MockLog")); dom.configure(setUpConfiguration(false, false, domains)); @@ -94,7 +94,7 @@ public class XMLDomainListTest { domains.add("domain1."); domains.add("domain2."); - XMLDomainList dom = new XMLDomainList(setUpDNSServer("localhost"), new EnvDetector()); + XMLDomainList dom = new XMLDomainList(setUpDNSServer("localhost")); dom.setLog(LoggerFactory.getLogger("MockLog")); dom.configure(setUpConfiguration(false, false, domains)); @@ -106,7 +106,7 @@ public class XMLDomainListTest { List<String> domains = new ArrayList<String>(); domains.add("domain1."); - XMLDomainList dom = new XMLDomainList(setUpDNSServer("local"), new EnvDetector()); + XMLDomainList dom = new XMLDomainList(setUpDNSServer("local")); dom.setLog(LoggerFactory.getLogger("MockLog")); dom.configure(setUpConfiguration(true, false, domains)); @@ -118,7 +118,7 @@ public class XMLDomainListTest { List<String> domains = new ArrayList<String>(); domains.add("domain1."); - XMLDomainList dom = new XMLDomainList(setUpDNSServer("localhost"), new EnvDetector()); + XMLDomainList dom = new XMLDomainList(setUpDNSServer("localhost")); dom.setLog(LoggerFactory.getLogger("MockLog")); dom.configure(setUpConfiguration(true, false, domains)); @@ -133,7 +133,7 @@ public class XMLDomainListTest { List<String> domains = new ArrayList<String>(); domains.add("domain1"); - XMLDomainList testee = new XMLDomainList(setUpDNSServer("hostname"), new EnvDetector()); + XMLDomainList testee = new XMLDomainList(setUpDNSServer("hostname")); testee.setLog(LoggerFactory.getLogger("MockLog")); testee.configure(setUpConfiguration(true, false, domains)); @@ -147,7 +147,7 @@ public class XMLDomainListTest { List<String> domains = new ArrayList<String>(); domains.add("domain1"); - XMLDomainList testee = new XMLDomainList(setUpDNSServer("localhost"), new EnvDetector()); + XMLDomainList testee = new XMLDomainList(setUpDNSServer("localhost")); testee.setLog(LoggerFactory.getLogger("MockLog")); testee.configure(setUpConfiguration(true, false, domains)); @@ -163,7 +163,7 @@ public class XMLDomainListTest { configuration.addProperty("domainnames.domainname", "domain1"); configuration.addProperty("defaultDomain", "localhost"); - XMLDomainList testee = new XMLDomainList(setUpDNSServer("localhost"), new EnvDetector()); + XMLDomainList testee = new XMLDomainList(setUpDNSServer("localhost")); testee.setLog(LoggerFactory.getLogger("MockLog")); testee.configure(configuration); http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java index 6e24ced..c09dd6d 100644 --- a/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java +++ b/server/data/data-hbase/src/main/java/org/apache/james/domainlist/hbase/HBaseDomainList.java @@ -37,7 +37,6 @@ import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.domainlist.hbase.def.HDomainList; import org.apache.james.domainlist.lib.AbstractDomainList; -import org.apache.james.domainlist.lib.EnvDetector; import org.apache.james.system.hbase.TablePool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,8 +52,8 @@ public class HBaseDomainList extends AbstractDomainList { private static final Logger log = LoggerFactory.getLogger(HBaseDomainList.class.getName()); @Inject - public HBaseDomainList(DNSService dns, EnvDetector envDetector) { - super(dns, envDetector); + public HBaseDomainList(DNSService dns) { + super(dns); } /** http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java b/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java index bcb38c5..64104b1 100644 --- a/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java +++ b/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java @@ -19,10 +19,10 @@ package org.apache.james.domainlist.hbase; import java.io.IOException; + import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.domainlist.lib.AbstractDomainListTest; -import org.apache.james.domainlist.lib.EnvDetector; import org.apache.james.mailbox.hbase.HBaseClusterSingleton; import org.apache.james.system.hbase.TablePool; import org.junit.BeforeClass; @@ -50,7 +50,7 @@ public class HBaseDomainListTest extends AbstractDomainListTest { */ @Override protected DomainList createDomainList() { - HBaseDomainList domainList = new HBaseDomainList(getDNSServer("localhost"), new EnvDetector()); + HBaseDomainList domainList = new HBaseDomainList(getDNSServer("localhost")); domainList.setLog(LoggerFactory.getLogger("MockLog")); domainList.setAutoDetect(false); domainList.setAutoDetectIP(false); http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java index 03fdfdd..c6a3565 100644 --- a/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java +++ b/server/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java @@ -35,7 +35,6 @@ import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.domainlist.jpa.model.JPADomain; import org.apache.james.domainlist.lib.AbstractDomainList; -import org.apache.james.domainlist.lib.EnvDetector; import com.google.common.collect.ImmutableList; @@ -52,8 +51,8 @@ public class JPADomainList extends AbstractDomainList { private EntityManagerFactory entityManagerFactory; @Inject - public JPADomainList(DNSService dns, EnvDetector envDetector, EntityManagerFactory entityManagerFactory) { - super(dns, envDetector); + public JPADomainList(DNSService dns, EntityManagerFactory entityManagerFactory) { + super(dns); this.entityManagerFactory = entityManagerFactory; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java b/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java index 8c225f5..3fd7e3d 100644 --- a/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java +++ b/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java @@ -22,7 +22,6 @@ import org.apache.james.backends.jpa.JpaTestCluster; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.jpa.model.JPADomain; import org.apache.james.domainlist.lib.AbstractDomainListTest; -import org.apache.james.domainlist.lib.EnvDetector; import org.slf4j.LoggerFactory; /** @@ -35,7 +34,6 @@ public class JPADomainListTest extends AbstractDomainListTest { @Override protected DomainList createDomainList() { JPADomainList jpaDomainList = new JPADomainList(getDNSServer("localhost"), - new EnvDetector(), JPA_TEST_CLUSTER.getEntityManagerFactory()); jpaDomainList.setLog(LoggerFactory.getLogger("JPADomainListMockLog")); jpaDomainList.setAutoDetect(false); http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/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 62c4f09..8e2a423 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 @@ -27,8 +27,6 @@ import java.util.Collection; import java.util.List; import java.util.Locale; -import javax.inject.Inject; - import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.dnsservice.api.DNSService; @@ -66,12 +64,15 @@ public abstract class AbstractDomainList implements DomainList, LogEnabled, Conf private Logger logger; private String defaultDomain; - @Inject public AbstractDomainList(DNSService dns, EnvDetector envDetector) { this.dns = dns; this.envDetector = envDetector; } + public AbstractDomainList(DNSService dns) { + this(dns, new EnvDetector()); + } + public void setLog(Logger logger) { this.logger = logger; } http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/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 d6c9033..adfd48f 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 @@ -28,7 +28,6 @@ import javax.inject.Inject; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.domainlist.lib.AbstractDomainList; -import org.apache.james.domainlist.lib.EnvDetector; import com.google.common.collect.ImmutableList; @@ -37,8 +36,8 @@ public class MemoryDomainList extends AbstractDomainList { private final List<String> domains; @Inject - public MemoryDomainList(DNSService dns, EnvDetector envDetector) { - super(dns, envDetector); + public MemoryDomainList(DNSService dns) { + super(dns); this.domains = new ArrayList<String>(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java b/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java index 0766c94..6b0e056 100644 --- a/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java +++ b/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java @@ -21,14 +21,13 @@ package org.apache.james.domainlist.memory; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.lib.AbstractDomainListTest; -import org.apache.james.domainlist.lib.EnvDetector; import org.slf4j.LoggerFactory; public class MemoryDomainListTest extends AbstractDomainListTest { @Override protected DomainList createDomainList() { - MemoryDomainList testee = new MemoryDomainList(getDNSServer("localhost"), new EnvDetector()); + MemoryDomainList testee = new MemoryDomainList(getDNSServer("localhost")); testee.setLog(LoggerFactory.getLogger(getClass())); testee.setAutoDetect(false); testee.setAutoDetectIP(false); http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/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 ab0dc93..b561142 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 @@ -27,7 +27,7 @@ import static org.mockito.Mockito.when; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.james.dnsservice.api.DNSService; -import org.apache.james.domainlist.lib.EnvDetector; +import org.apache.james.domainlist.lib.AbstractDomainList; import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.user.memory.MemoryUsersRepository; import org.apache.mailet.MailAddress; @@ -52,8 +52,13 @@ public class JamesMailetContextTest { @Before public void setUp() throws Exception { - domainList = new MemoryDomainList(DNS_SERVICE, new EnvDetector()); + domainList = new MemoryDomainList(DNS_SERVICE); domainList.setLog(LOGGER); + 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); + usersRepository = MemoryUsersRepository.withVirtualHosting(); usersRepository.setDomainList(domainList); testee = new JamesMailetContext(); @@ -94,7 +99,6 @@ public class JamesMailetContextTest { .thenReturn(DOMAIN_COM); domainList.configure(configuration); - domainList.addDomain(DOMAIN_COM); usersRepository.addUser(USERMAIL, PASSWORD); assertThat(testee.isLocalUser(USERNAME)).isTrue(); http://git-wip-us.apache.org/repos/asf/james-project/blob/f1aae405/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainRoutesTest.java index c30b106..827e473 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainRoutesTest.java @@ -38,7 +38,6 @@ import java.net.InetAddress; 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.domainlist.lib.EnvDetector; import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.metrics.logger.DefaultMetricFactory; import org.apache.james.webadmin.WebAdminServer; @@ -95,7 +94,7 @@ public class DomainRoutesTest { when(dnsService.getHostName(any())).thenReturn("localhost"); when(dnsService.getLocalHost()).thenReturn(InetAddress.getByName("localhost")); - MemoryDomainList domainList = new MemoryDomainList(dnsService, new EnvDetector()); + MemoryDomainList domainList = new MemoryDomainList(dnsService); domainList.setLog(LOGGER); domainList.setAutoDetectIP(false); createServer(domainList); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org