JAMES-2267 MailetContainer integration: Provide default value for postmaster
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/623620ee Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/623620ee Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/623620ee Branch: refs/heads/master Commit: 623620eef3529c68d69a85f3f5c30625e68ea320 Parents: 7fa62d6 Author: benwa <[email protected]> Authored: Tue Dec 19 11:25:55 2017 +0700 Committer: benwa <[email protected]> Committed: Fri Jan 5 09:13:51 2018 +0700 ---------------------------------------------------------------------- .../org/apache/james/mailets/AddDeliveredToHeaderTest.java | 1 - .../apache/james/mailets/CommonMailetConfigurationTest.java | 1 - .../apache/james/mailets/NetworkMatcherIntegrationTest.java | 1 - .../james/mailets/RecipientRewriteTableIntegrationTest.java | 1 - .../src/test/java/org/apache/james/mailets/SieveDelivery.java | 1 - .../org/apache/james/mailets/SmtpAuthIntegrationTest.java | 1 - .../apache/james/mailets/configuration/MailetContainer.java | 7 +++++-- .../james/mailets/crypto/SMIMEDecryptIntegrationTest.java | 1 - .../apache/james/mailets/crypto/SMIMESignIntegrationTest.java | 1 - .../org/apache/james/smtp/SmtpAuthorizedAddressesTest.java | 2 -- .../org/apache/james/smtp/SmtpBracketEnforcementTest.java | 2 -- .../org/apache/james/smtp/SmtpIdentityVerificationTest.java | 2 -- .../java/org/apache/james/smtp/SmtpSizeLimitationTest.java | 2 -- .../james/transport/mailets/AmqpForwardAttachmentTest.java | 1 - .../org/apache/james/transport/mailets/GroupMappingTest.java | 1 - .../james/transport/mailets/ICSAttachmentWorkflowTest.java | 1 - .../apache/james/transport/mailets/StripAttachmentTest.java | 1 - 17 files changed, 5 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java index fda90d0..662a6df 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java @@ -55,7 +55,6 @@ public class AddDeliveredToHeaderTest { @Before public void setup() throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + DEFAULT_DOMAIN) .addProcessor(CommonProcessors.root()) .addProcessor(CommonProcessors.error()) .addProcessor(CommonProcessors.transport()) http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java index ee78589..27c94c2 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java @@ -54,7 +54,6 @@ public class CommonMailetConfigurationTest { @Before public void setup() throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + DEFAULT_DOMAIN) .addProcessor(CommonProcessors.root()) .addProcessor(CommonProcessors.error()) .addProcessor(CommonProcessors.transport()) http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java ---------------------------------------------------------------------- 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 a38c1bf..68af424 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 @@ -76,7 +76,6 @@ public class NetworkMatcherIntegrationTest { private TemporaryJamesServer createJamesServerWithRootProcessor(ProcessorConfiguration.Builder rootProcessor) throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + JAMES_APACHE_ORG) .addProcessor(rootProcessor) .addProcessor(CommonProcessors.error()) .addProcessor(deliverOnlyTransport()) http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java index 2cf095e..671a6b3 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java @@ -65,7 +65,6 @@ public class RecipientRewriteTableIntegrationTest { @Before public void setup() throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + JAMES_APACHE_ORG) .addProcessor(CommonProcessors.root()) .addProcessor(CommonProcessors.error()) .addProcessor(CommonProcessors.transport()) http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java index b81e756..bc9b77b 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SieveDelivery.java @@ -56,7 +56,6 @@ public class SieveDelivery { @Before public void setup() throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + DEFAULT_DOMAIN) .addProcessor(CommonProcessors.root()) .addProcessor(CommonProcessors.error()) .addProcessor(CommonProcessors.transport()) http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java ---------------------------------------------------------------------- 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 d692395..6c73a27 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 @@ -77,7 +77,6 @@ public class SmtpAuthIntegrationTest { .build(); MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + JAMES_APACHE_ORG) .addProcessor(rootProcessor) .addProcessor(CommonProcessors.error()) .addProcessor(deliverOnlyTransport()) http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java index 49b4ced..2adbf9e 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java @@ -36,17 +36,19 @@ public class MailetContainer implements SerializableAsXml { public static class Builder { public static final int DEFAULT_THREAD_COUNT = 5; - private String postmaster; + public static final String DEFAULT_POSTMASTER = "postmaster@localhost"; + private Optional<String> postmaster; private Optional<Integer> threads; private ImmutableList.Builder<ProcessorConfiguration> processors; private Builder() { processors = ImmutableList.builder(); threads = Optional.empty(); + postmaster = Optional.empty(); } public Builder postmaster(String postmaster) { - this.postmaster = postmaster; + this.postmaster = Optional.of(postmaster); return this; } @@ -66,6 +68,7 @@ public class MailetContainer implements SerializableAsXml { } public MailetContainer build() { + String postmaster = this.postmaster.orElse(DEFAULT_POSTMASTER); int threads = this.threads.orElse(DEFAULT_THREAD_COUNT); Preconditions.checkState(!Strings.isNullOrEmpty(postmaster), "'postmaster' is mandatory"); Preconditions.checkState(threads > 0, "'threads' should be greater than 0"); http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java index 7663084..7739eaf 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java @@ -72,7 +72,6 @@ public class SMIMEDecryptIntegrationTest { @Before public void setup() throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + DEFAULT_DOMAIN) .addProcessor(CommonProcessors.root()) .addProcessor(CommonProcessors.error()) .addProcessor(ProcessorConfiguration.transport() http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java index 1ea352f..a6c3208 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java @@ -78,7 +78,6 @@ public class SMIMESignIntegrationTest { @Before public void setup() throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + DEFAULT_DOMAIN) .addProcessor(CommonProcessors.root()) .addProcessor(CommonProcessors.error()) .addProcessor(ProcessorConfiguration.transport() http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java ---------------------------------------------------------------------- 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 9377887..800262c 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 @@ -61,7 +61,6 @@ import com.jayway.restassured.builder.RequestSpecBuilder; import com.jayway.restassured.http.ContentType; public class SmtpAuthorizedAddressesTest { - private static final String DEFAULT_DOMAIN = "james.org"; private static final String LOCALHOST_IP = "127.0.0.1"; private static final int SMTP_PORT = 1025; public static final int IMAP_PORT = 1143; @@ -108,7 +107,6 @@ public class SmtpAuthorizedAddressesTest { private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + DEFAULT_DOMAIN) .addProcessor(ProcessorConfiguration.root() .addMailet(MailetConfiguration.builder() .matcher(All.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java index b1e6af9..4db4a87 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java @@ -44,7 +44,6 @@ import com.jayway.awaitility.Duration; import com.jayway.awaitility.core.ConditionFactory; public class SmtpBracketEnforcementTest { - private static final String DEFAULT_DOMAIN = "james.org"; private static final String LOCALHOST_IP = "127.0.0.1"; private static final int SMTP_PORT = 1025; private static final String PASSWORD = "secret"; @@ -71,7 +70,6 @@ public class SmtpBracketEnforcementTest { private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + DEFAULT_DOMAIN) .addProcessor(ProcessorConfiguration.root() .addMailet(MailetConfiguration.builder() .matcher(All.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java index 3a22a07..c1890e9 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java @@ -44,7 +44,6 @@ import com.jayway.awaitility.Duration; import com.jayway.awaitility.core.ConditionFactory; public class SmtpIdentityVerificationTest { - private static final String DEFAULT_DOMAIN = "james.org"; private static final String LOCALHOST_IP = "127.0.0.1"; private static final int SMTP_PORT = 1025; private static final String PASSWORD = "secret"; @@ -73,7 +72,6 @@ public class SmtpIdentityVerificationTest { private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + DEFAULT_DOMAIN) .addProcessor(ProcessorConfiguration.root() .addMailet(MailetConfiguration.builder() .matcher(All.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java index 1be05cb..295021b 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java @@ -45,7 +45,6 @@ import com.jayway.awaitility.Duration; import com.jayway.awaitility.core.ConditionFactory; public class SmtpSizeLimitationTest { - private static final String DEFAULT_DOMAIN = "james.org"; private static final String LOCALHOST_IP = "127.0.0.1"; private static final int SMTP_PORT = 1025; private static final String PASSWORD = "secret"; @@ -72,7 +71,6 @@ public class SmtpSizeLimitationTest { private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + DEFAULT_DOMAIN) .addProcessor(ProcessorConfiguration.root() .addMailet(MailetConfiguration.builder() .matcher(All.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java ---------------------------------------------------------------------- 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 ea2f222..0d4597b 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 @@ -88,7 +88,6 @@ public class AmqpForwardAttachmentTest { @Before public void setup() throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + JAMES_APACHE_ORG) .addProcessor(CommonProcessors.root()) .addProcessor(CommonProcessors.error()) .addProcessor(ProcessorConfiguration.transport() http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java ---------------------------------------------------------------------- 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 438ad12..69362eb 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 @@ -108,7 +108,6 @@ public class GroupMappingTest { inMemoryDNSService.registerRecord("yopmail.com", containerIp, "yopmail.com"); MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + DOMAIN1) .addProcessor(ProcessorConfiguration.root() .enableJmx(true) .addMailet(MailetConfiguration.builder() http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java ---------------------------------------------------------------------- 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 09f6b50..c6be395 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 @@ -454,7 +454,6 @@ public class ICSAttachmentWorkflowTest { @Before public void setup() throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + JAMES_APACHE_ORG) .addProcessor(CommonProcessors.root()) .addProcessor(CommonProcessors.error()) .addProcessor(ProcessorConfiguration.transport() http://git-wip-us.apache.org/repos/asf/james-project/blob/623620ee/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java ---------------------------------------------------------------------- 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 478a1df..15b7bff 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 @@ -72,7 +72,6 @@ public class StripAttachmentTest { @Before public void setup() throws Exception { MailetContainer mailetContainer = MailetContainer.builder() - .postmaster("postmaster@" + JAMES_APACHE_ORG) .addProcessor(CommonProcessors.root()) .addProcessor(CommonProcessors.error()) .addProcessor(ProcessorConfiguration.transport() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
