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 79823d42b9edc02ee5fe7a802c43d0a5f1422e08
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Tue Jun 16 10:37:08 2020 +0700
JAMES-3214 Move TestingMailRepositoryLoader out of test package
This simplifies dependency handling (test package transitivity).
---
server/data/data-memory/pom.xml | 1 -
.../james/mailrepository/memory/SimpleMailRepositoryLoader.java} | 2 +-
.../james/mailrepository/memory/MemoryMailRepositoryStoreTest.java | 4 ++--
server/mailet/mailets/pom.xml | 6 ------
.../james/transport/mailets/ToSenderDomainRepositoryTest.java | 4 ++--
server/protocols/protocols-smtp/pom.xml | 6 ------
.../src/test/java/org/apache/james/smtpserver/SMTPServerTest.java | 4 ++--
server/protocols/webadmin/webadmin-mailrepository/pom.xml | 6 ------
.../apache/james/webadmin/routes/MailRepositoriesRoutesTest.java | 4 ++--
.../org/apache/james/webadmin/service/ReprocessingServiceTest.java | 4 ++--
10 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml
index 214e522..9515716 100644
--- a/server/data/data-memory/pom.xml
+++ b/server/data/data-memory/pom.xml
@@ -76,7 +76,6 @@
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>james-server-mailrepository-memory</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
diff --git
a/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/TestingMailRepositoryLoader.java
b/server/data/data-memory/src/main/java/org/apache/james/mailrepository/memory/SimpleMailRepositoryLoader.java
similarity index 96%
rename from
server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/TestingMailRepositoryLoader.java
rename to
server/data/data-memory/src/main/java/org/apache/james/mailrepository/memory/SimpleMailRepositoryLoader.java
index 025d5a6..d4b587f 100644
---
a/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/TestingMailRepositoryLoader.java
+++
b/server/data/data-memory/src/main/java/org/apache/james/mailrepository/memory/SimpleMailRepositoryLoader.java
@@ -23,7 +23,7 @@ import org.apache.james.mailrepository.api.MailRepository;
import org.apache.james.mailrepository.api.MailRepositoryStore;
import org.apache.james.mailrepository.api.MailRepositoryUrl;
-public class TestingMailRepositoryLoader implements MailRepositoryLoader {
+public class SimpleMailRepositoryLoader implements MailRepositoryLoader {
@Override
public MailRepository load(String fullyQualifiedClassName,
MailRepositoryUrl url) throws MailRepositoryStore.MailRepositoryStoreException {
if
(fullyQualifiedClassName.equals(MemoryMailRepository.class.getCanonicalName()))
{
diff --git
a/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java
b/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java
index ffb36e2..7f8692e 100644
---
a/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java
+++
b/server/data/data-memory/src/test/java/org/apache/james/mailrepository/memory/MemoryMailRepositoryStoreTest.java
@@ -47,14 +47,14 @@ public class MemoryMailRepositoryStoreTest {
private MemoryMailRepositoryUrlStore urlStore;
- private TestingMailRepositoryLoader loader;
+ private SimpleMailRepositoryLoader loader;
private MemoryMailRepositoryStore repositoryStore;
private FileSystemImpl fileSystem;
private Configuration configuration;
@Before
public void setUp() throws Exception {
- loader = new TestingMailRepositoryLoader();
+ loader = new SimpleMailRepositoryLoader();
configuration = Configuration.builder()
.workingDirectory("../")
.configurationFromClasspath()
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index 6d88d25..d0b3791 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -127,12 +127,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-data-memory</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
diff --git
a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java
b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java
index ee21b37..f45f50c 100644
---
a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java
+++
b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java
@@ -38,7 +38,7 @@ import
org.apache.james.mailrepository.memory.MailRepositoryStoreConfiguration;
import org.apache.james.mailrepository.memory.MemoryMailRepository;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryStore;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryUrlStore;
-import org.apache.james.mailrepository.memory.TestingMailRepositoryLoader;
+import org.apache.james.mailrepository.memory.SimpleMailRepositoryLoader;
import org.apache.mailet.Mail;
import org.apache.mailet.base.MailAddressFixture;
import org.apache.mailet.base.test.FakeMail;
@@ -74,7 +74,7 @@ class ToSenderDomainRepositoryTest {
MemoryMailRepository.class.getName(),
new BaseHierarchicalConfiguration()));
- mailRepositoryStore = new MemoryMailRepositoryStore(urlStore, new
TestingMailRepositoryLoader(), configuration);
+ mailRepositoryStore = new MemoryMailRepositoryStore(urlStore, new
SimpleMailRepositoryLoader(), configuration);
mailRepositoryStore.init();
}
diff --git a/server/protocols/protocols-smtp/pom.xml
b/server/protocols/protocols-smtp/pom.xml
index c498d84..c4dadc1 100644
--- a/server/protocols/protocols-smtp/pom.xml
+++ b/server/protocols/protocols-smtp/pom.xml
@@ -62,12 +62,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-data-memory</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
<dependency>
diff --git
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
index 04bda85..98d4975 100644
---
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
+++
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
@@ -60,7 +60,7 @@ import
org.apache.james.mailrepository.memory.MailRepositoryStoreConfiguration;
import org.apache.james.mailrepository.memory.MemoryMailRepository;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryStore;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryUrlStore;
-import org.apache.james.mailrepository.memory.TestingMailRepositoryLoader;
+import org.apache.james.mailrepository.memory.SimpleMailRepositoryLoader;
import org.apache.james.metrics.api.Metric;
import org.apache.james.metrics.api.MetricFactory;
import org.apache.james.metrics.tests.RecordingMetricFactory;
@@ -246,7 +246,7 @@ public class SMTPServerTest {
MemoryMailRepository.class.getName(),
new BaseHierarchicalConfiguration()));
- mailRepositoryStore = new MemoryMailRepositoryStore(urlStore, new
TestingMailRepositoryLoader(), configuration);
+ mailRepositoryStore = new MemoryMailRepositoryStore(urlStore, new
SimpleMailRepositoryLoader(), configuration);
mailRepositoryStore.init();
}
diff --git a/server/protocols/webadmin/webadmin-mailrepository/pom.xml
b/server/protocols/webadmin/webadmin-mailrepository/pom.xml
index 866a766..9b0723d 100644
--- a/server/protocols/webadmin/webadmin-mailrepository/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailrepository/pom.xml
@@ -64,12 +64,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>james-server-data-memory</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>james-server-queue-api</artifactId>
</dependency>
<dependency>
diff --git
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index d1806a2..1ad92ec 100644
---
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -59,7 +59,7 @@ import
org.apache.james.mailrepository.memory.MailRepositoryStoreConfiguration;
import org.apache.james.mailrepository.memory.MemoryMailRepository;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryStore;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryUrlStore;
-import org.apache.james.mailrepository.memory.TestingMailRepositoryLoader;
+import org.apache.james.mailrepository.memory.SimpleMailRepositoryLoader;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.MailQueueName;
import org.apache.james.queue.api.ManageableMailQueue;
@@ -1803,7 +1803,7 @@ public class MailRepositoriesRoutesTest {
ImmutableList.of(new Protocol("other")),
MemoryMailRepository.class.getName(),
new BaseHierarchicalConfiguration()));
- mailRepositoryStore = new MemoryMailRepositoryStore(urlStore, new
TestingMailRepositoryLoader(), configuration);
+ mailRepositoryStore = new MemoryMailRepositoryStore(urlStore, new
SimpleMailRepositoryLoader(), configuration);
mailRepositoryStore.init();
}
diff --git
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingServiceTest.java
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingServiceTest.java
index 02cbc0d..c191cf5 100644
---
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingServiceTest.java
+++
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/service/ReprocessingServiceTest.java
@@ -35,7 +35,7 @@ import
org.apache.james.mailrepository.memory.MailRepositoryStoreConfiguration;
import org.apache.james.mailrepository.memory.MemoryMailRepository;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryStore;
import org.apache.james.mailrepository.memory.MemoryMailRepositoryUrlStore;
-import org.apache.james.mailrepository.memory.TestingMailRepositoryLoader;
+import org.apache.james.mailrepository.memory.SimpleMailRepositoryLoader;
import org.apache.james.queue.api.MailQueueFactory;
import org.apache.james.queue.api.MailQueueName;
import org.apache.james.queue.api.ManageableMailQueue;
@@ -187,7 +187,7 @@ public class ReprocessingServiceTest {
MemoryMailRepository.class.getName(),
new BaseHierarchicalConfiguration()));
- MemoryMailRepositoryStore mailRepositoryStore = new
MemoryMailRepositoryStore(urlStore, new TestingMailRepositoryLoader(),
configuration);
+ MemoryMailRepositoryStore mailRepositoryStore = new
MemoryMailRepositoryStore(urlStore, new SimpleMailRepositoryLoader(),
configuration);
mailRepositoryStore.init();
return mailRepositoryStore;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
