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 bt...@apache.org on 2020/06/29 04:38:34 UTC
[james-project] 04/09: JAMES-3276 TemporaryJamesServer mutable
static builders are replaced by methods
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 8343d3a05f4c1933f552aa642ba7109b6bc6f658
Author: Gautier DI FOLCO <gd...@linagora.com>
AuthorDate: Wed Jun 24 11:32:17 2020 +0200
JAMES-3276 TemporaryJamesServer mutable static builders are replaced by methods
---
.../james/mailets/BounceIntegrationTest.java | 2 +-
.../apache/james/mailets/DKIMIntegrationTest.java | 2 +-
...ectResolutionRemoteDeliveryIntegrationTest.java | 10 +++++-----
.../GatewayRemoteDeliveryIntegrationTest.java | 4 ++--
.../mailets/NetworkMatcherIntegrationTest.java | 2 +-
.../mailets/RemoteDeliveryDKIMIntegrationTest.java | 6 +++---
.../mailets/SenderIsLocalIntegrationTest.java | 2 +-
.../mailets/SizeGreaterThanIntegrationTest.java | 2 +-
.../james/mailets/SmtpAuthIntegrationTest.java | 2 +-
.../apache/james/mailets/TemporaryJamesServer.java | 22 +++++++++++++---------
.../james/smtp/SmtpAuthorizedAddressesTest.java | 2 +-
.../org/apache/james/smtp/SmtpContentTypeTest.java | 2 +-
.../apache/james/smtp/SmtpRandomStoringTest.java | 2 +-
.../james/smtp/extensions/SMTPHeloHooksTest.java | 2 +-
.../james/transport/mailets/AddFooterTest.java | 2 +-
.../james/transport/mailets/AliasMappingTest.java | 2 +-
.../mailets/AmqpForwardAttachmentTest.java | 2 +-
.../transport/mailets/ContactExtractorTest.java | 2 +-
.../transport/mailets/DlpIntegrationTest.java | 2 +-
.../james/transport/mailets/DomainMappingTest.java | 2 +-
.../transport/mailets/GroupMappingRelayTest.java | 2 +-
.../james/transport/mailets/GroupMappingTest.java | 2 +-
.../mailets/ICSAttachmentWorkflowTest.java | 2 +-
.../transport/mailets/IsOverQuotaMatcherTest.java | 2 +-
.../mailets/MailReprocessingIntegrationTest.java | 2 +-
.../james/transport/mailets/SpamAssassinTest.java | 2 +-
.../transport/mailets/StripAttachmentTest.java | 2 +-
.../james/transport/mailets/ToRepositoryTest.java | 2 +-
.../mailets/ToSenderDomainRepositoryTest.java | 12 ++++++------
29 files changed, 53 insertions(+), 49 deletions(-)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
index 2243401..254247c 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
@@ -236,7 +236,7 @@ public class BounceIntegrationTest {
}
private MailetContainer.Builder generateMailetContainerConfiguration(MailetConfiguration.Builder redirectionMailetConfiguration) {
- return TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ return TemporaryJamesServer.defaultMailetContainerConfiguration()
.postmaster(POSTMASTER)
.putProcessor(transport())
.putProcessor(bounces(redirectionMailetConfiguration));
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java
index 09601aa..25715b7 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DKIMIntegrationTest.java
@@ -113,7 +113,7 @@ public class DKIMIntegrationTest {
public void setup() throws Exception {
dkimAuthResults = new ArrayList<>();
ExtractAttributeStub.setDkimAuthResultInspector(value -> dkimAuthResults.add(value.map(result -> (String) result)));
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailet(DKIMSIGN_MAILET)
.addMailet(DKIMVERIFY_MAILET)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
index 20477b2..87c0e9d 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/DirectResolutionRemoteDeliveryIntegrationTest.java
@@ -97,7 +97,7 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(directResolutionTransport())
.putProcessor(CommonProcessors.bounces()))
.build(temporaryFolder.newFolder());
@@ -124,7 +124,7 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(directResolutionTransport())
.putProcessor(CommonProcessors.bounces()))
.build(temporaryFolder.newFolder());
@@ -149,7 +149,7 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(transport())
.putProcessor(CommonProcessors.bounces()))
.build(temporaryFolder.newFolder());
@@ -176,7 +176,7 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(transport())
.putProcessor(CommonProcessors.bounces()))
.build(temporaryFolder.newFolder());
@@ -204,7 +204,7 @@ public class DirectResolutionRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(LOCAL_DELIVERY)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
index 9f32a85..a67e36e 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -222,7 +222,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_AND_IMAP_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.LOCAL_DELIVERY)
@@ -253,7 +253,7 @@ public class GatewayRemoteDeliveryIntegrationTest {
}
private MailetContainer.Builder generateMailetContainerConfiguration(String gatewayProperty) {
- return TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ return TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(relayAndLocalDeliveryTransport(gatewayProperty));
}
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
index 8dff7f0..69976fb 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -63,7 +63,7 @@ public class NetworkMatcherIntegrationTest {
private TemporaryJamesServer createJamesServerWithRootProcessor(ProcessorConfiguration.Builder rootProcessor) throws Exception {
TemporaryJamesServer temporaryJamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE)
- .withMailetContainer(TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.defaultMailetContainerConfiguration()
.putProcessor(rootProcessor)
.putProcessor(CommonProcessors.deliverOnlyTransport()))
.build(temporaryFolder.newFolder());
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryDKIMIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryDKIMIntegrationTest.java
index 15daea2..9dcdac3 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryDKIMIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryDKIMIntegrationTest.java
@@ -141,7 +141,7 @@ class RemoteDeliveryDKIMIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(directResolutionTransport(MailetConfiguration.remoteDeliveryBuilder()
.addProperty("mail.smtp.allow8bitmime", "true")))
.putProcessor(CommonProcessors.bounces()))
@@ -182,7 +182,7 @@ class RemoteDeliveryDKIMIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(directResolutionTransport(MailetConfiguration.remoteDeliveryBuilder()
.addProperty("mail.smtp.allow8bitmime", "true")))
.putProcessor(CommonProcessors.bounces()))
@@ -228,7 +228,7 @@ class RemoteDeliveryDKIMIntegrationTest {
jamesServer = TemporaryJamesServer.builder()
.withBase(SMTP_ONLY_MODULE)
.withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
- .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(directResolutionTransport(MailetConfiguration.remoteDeliveryBuilder()))
.putProcessor(CommonProcessors.bounces()))
.build(tempDir);
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SenderIsLocalIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SenderIsLocalIntegrationTest.java
index b00ec11..f878d1a 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SenderIsLocalIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SenderIsLocalIntegrationTest.java
@@ -71,7 +71,7 @@ public class SenderIsLocalIntegrationTest {
public void setUp() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withBase(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE)
- .withMailetContainer(TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.defaultMailetContainerConfiguration()
.postmaster(POSTMASTER)
.putProcessor(transport()))
.build(temporaryFolder.newFolder());
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SizeGreaterThanIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SizeGreaterThanIntegrationTest.java
index 2557266..184b02b 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SizeGreaterThanIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SizeGreaterThanIntegrationTest.java
@@ -100,7 +100,7 @@ public class SizeGreaterThanIntegrationTest {
}
private MailetContainer.Builder generateMailetContainerConfiguration() {
- return TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ return TemporaryJamesServer.defaultMailetContainerConfiguration()
.postmaster(POSTMASTER)
.putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
index 791a84d..e9580b4 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
@@ -71,7 +71,7 @@ public class SmtpAuthIntegrationTest {
.addProperty("processor", ProcessorConfiguration.TRANSPORT_PROCESSOR))
.addMailet(MailetConfiguration.TO_BOUNCE);
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.defaultMailetContainerConfiguration()
.putProcessor(rootProcessor)
.putProcessor(CommonProcessors.deliverOnlyTransport())
.putProcessor(bounces());
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
index abf31e6..b1fabcf 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -50,15 +50,19 @@ import com.google.inject.Module;
public class TemporaryJamesServer {
- public static final MailetContainer.Builder DEFAULT_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
- .putProcessor(CommonProcessors.root())
- .putProcessor(CommonProcessors.error())
- .putProcessor(CommonProcessors.transport());
+ public static MailetContainer.Builder defaultMailetContainerConfiguration() {
+ return MailetContainer.builder()
+ .putProcessor(CommonProcessors.root())
+ .putProcessor(CommonProcessors.error())
+ .putProcessor(CommonProcessors.transport());
+ }
- public static final MailetContainer.Builder SIMPLE_MAILET_CONTAINER_CONFIGURATION = MailetContainer.builder()
- .putProcessor(CommonProcessors.simpleRoot())
- .putProcessor(CommonProcessors.error())
- .putProcessor(CommonProcessors.transport());
+ public static MailetContainer.Builder simpleMailetContainerConfiguration() {
+ return MailetContainer.builder()
+ .putProcessor(CommonProcessors.simpleRoot())
+ .putProcessor(CommonProcessors.error())
+ .putProcessor(CommonProcessors.transport());
+ }
public static class Builder {
@@ -106,7 +110,7 @@ public class TemporaryJamesServer {
public TemporaryJamesServer build(File workingDir) throws Exception {
return new TemporaryJamesServer(
workingDir,
- mailetConfiguration.orElse(DEFAULT_MAILET_CONTAINER_CONFIGURATION.build()),
+ mailetConfiguration.orElse(defaultMailetContainerConfiguration().build()),
smtpConfiguration.orElse(SmtpConfiguration.DEFAULT),
module.orElse(MemoryJamesServerMain.IN_MEMORY_SERVER_AGGREGATE_MODULE),
overrideModules.build());
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
index 21fd00d..a736851 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
@@ -66,7 +66,7 @@ public class SmtpAuthorizedAddressesTest {
private TemporaryJamesServer jamesServer;
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailetsFrom(CommonProcessors.deliverOnlyTransport())
.addMailet(MailetConfiguration.remoteDeliveryBuilder()
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpContentTypeTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpContentTypeTest.java
index 8a3ec39..6274b01 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpContentTypeTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpContentTypeTest.java
@@ -70,7 +70,7 @@ public class SmtpContentTypeTest {
private TemporaryJamesServer jamesServer;
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailetsFrom(CommonProcessors.deliverOnlyTransport())
.addMailet(MailetConfiguration.remoteDeliveryBuilder()
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java
index 8ceb556..5c131a2 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpRandomStoringTest.java
@@ -131,7 +131,7 @@ public class SmtpRandomStoringTest {
}
private void createJamesServer() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailet(RANDOM_STORING)
.addMailetsFrom(CommonProcessors.deliverOnlyTransport()));
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/extensions/SMTPHeloHooksTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/extensions/SMTPHeloHooksTest.java
index 85560ae..377b238 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/extensions/SMTPHeloHooksTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/extensions/SMTPHeloHooksTest.java
@@ -65,7 +65,7 @@ public class SMTPHeloHooksTest {
private TemporaryJamesServer jamesServer;
private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(CommonProcessors.deliverOnlyTransport());
jamesServer = TemporaryJamesServer.builder()
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
index 1679359..e3e69a4 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
@@ -63,7 +63,7 @@ public class AddFooterTest {
public void setup() throws Exception {
jamesServer = TemporaryJamesServer.builder()
.withOverrides(new ActiveMQQueueModule())
- .withMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ .withMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java
index efd7863..efa15ff 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AliasMappingTest.java
@@ -93,7 +93,7 @@ public class AliasMappingTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(CommonProcessors.rrtErrorEnabledTransport())
.putProcessor(CommonProcessors.rrtErrorProcessor());
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
index cc8ff4e..0b4dbd2 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
@@ -83,7 +83,7 @@ public class AmqpForwardAttachmentTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.defaultMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
index 2652ad1..610c3bf 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
@@ -82,7 +82,7 @@ public class ContactExtractorTest {
@Before
public void setup() throws Exception {
String attribute = "ExtractedContacts";
- MailetContainer.Builder mailets = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailets = TemporaryJamesServer.defaultMailetContainerConfiguration()
.postmaster(SENDER)
.putProcessor(
ProcessorConfiguration.transport()
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
index 957ee5c..2628219 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
@@ -71,7 +71,7 @@ public class DlpIntegrationTest {
private RequestSpecification specification;
private void createJamesServer(MailetConfiguration.Builder dlpMailet) throws Exception {
- MailetContainer.Builder mailets = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailets = TemporaryJamesServer.defaultMailetContainerConfiguration()
.putProcessor(
ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DomainMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DomainMappingTest.java
index a29cf95..18c9d9b 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DomainMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DomainMappingTest.java
@@ -78,7 +78,7 @@ public class DomainMappingTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(CommonProcessors.rrtErrorEnabledTransport())
.putProcessor(CommonProcessors.rrtErrorProcessor());
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
index 8f08e88..c48d6e2 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java
@@ -76,7 +76,7 @@ public class GroupMappingRelayTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(CommonProcessors.rrtErrorEnabledTransport()
.addMailet(MailetConfiguration.remoteDeliveryBuilder()
.matcher(All.class)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
index 2bd6cef..690f696 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
@@ -82,7 +82,7 @@ public class GroupMappingTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(CommonProcessors.rrtErrorEnabledTransport())
.putProcessor(CommonProcessors.rrtErrorProcessor());
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
index 64c34ff..3ff99ba 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -451,7 +451,7 @@ public class ICSAttachmentWorkflowTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.defaultMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java
index 11134f6..63326f5 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/IsOverQuotaMatcherTest.java
@@ -75,7 +75,7 @@ public class IsOverQuotaMatcherTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.defaultMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(IsOverQuota.class)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java
index 927363b..a17929f 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java
@@ -71,7 +71,7 @@ public class MailReprocessingIntegrationTest {
@Before
public void createJamesServer() throws Exception {
- MailetContainer.Builder mailets = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailets = TemporaryJamesServer.defaultMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.BCC_STRIPPER)
.addMailet(MailetConfiguration.builder()
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java
index 8439a85..fb019cc 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/SpamAssassinTest.java
@@ -74,7 +74,7 @@ public class SpamAssassinTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailets = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailets = TemporaryJamesServer.defaultMailetContainerConfiguration()
.putProcessor(
ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
index ab116ce..0f62d8b 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
@@ -63,7 +63,7 @@ public class StripAttachmentTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.DEFAULT_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.defaultMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.transport()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
index bcdd0dc..7ac3f96 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToRepositoryTest.java
@@ -68,7 +68,7 @@ public class ToRepositoryTest {
@Before
public void setup() throws Exception {
- MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ MailetContainer.Builder mailetContainer = TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java
index a2ebe2a..62ebdd1 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ToSenderDomainRepositoryTest.java
@@ -66,7 +66,7 @@ public class ToSenderDomainRepositoryTest {
@Test
public void incomingMailShouldBeStoredInCorrespondingMailRepository() throws Exception {
- startJamesServerWithMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ startJamesServerWithMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -86,7 +86,7 @@ public class ToSenderDomainRepositoryTest {
@Test
public void incomingMailShouldBeStoredWhenRepositoryDoesNotExistAndAllowedToCreateRepository() throws Exception {
- startJamesServerWithMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ startJamesServerWithMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -107,7 +107,7 @@ public class ToSenderDomainRepositoryTest {
@Test
public void incomingMailShouldBeStoredWhenRepositoryExistsAndAllowedToCreateRepository() throws Exception {
- startJamesServerWithMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ startJamesServerWithMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -130,7 +130,7 @@ public class ToSenderDomainRepositoryTest {
@Test
public void incomingMailShouldBeIgnoredWhenRepositoryDoesNotExistAndNotAllowedToCreateRepository() throws Exception {
- startJamesServerWithMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ startJamesServerWithMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -156,7 +156,7 @@ public class ToSenderDomainRepositoryTest {
@Test
public void incomingMailShouldBeStoredWhenRepositoryExistsAndNotAllowedToCreateRepository() throws Exception {
- startJamesServerWithMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ startJamesServerWithMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
@@ -179,7 +179,7 @@ public class ToSenderDomainRepositoryTest {
@Test
public void incomingMailsShouldBeStoredInCorrespondingMailRepository() throws Exception {
- startJamesServerWithMailetContainer(TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION
+ startJamesServerWithMailetContainer(TemporaryJamesServer.simpleMailetContainerConfiguration()
.putProcessor(ProcessorConfiguration.root()
.addMailet(MailetConfiguration.builder()
.matcher(All.class)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org