JAMES-2267 MailetContainer integration: provide a default value for t…

…hreads
apache · Jan 5, 2018 · 7fa62d6 · 7fa62d6
1 parent b8e7d52
commit 7fa62d6
Show file tree

Hide file tree

Showing 20 changed files with 7 additions and 26 deletions.
diff --git a/.../integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java b/.../integration-testing/src/test/java/org/apache/james/mailets/AddDeliveredToHeaderTest.java
@@ -56,7 +56,6 @@ public class AddDeliveredToHeaderTest {
     public void setup() throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + DEFAULT_DOMAIN)
-            .threads(5)
             .addProcessor(CommonProcessors.root())
             .addProcessor(CommonProcessors.error())
             .addProcessor(CommonProcessors.transport())

diff --git a/...let/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java b/...let/integration-testing/src/test/java/org/apache/james/mailets/BounceIntegrationTest.java
@@ -246,7 +246,6 @@ public void notifyPostmasterMailetShouldDeliverBounce() throws Exception {
     private MailetContainer generateMailetContainerConfiguration(MailetConfiguration.Builder redirectionMailetConfiguration) {
         return MailetContainer.builder()
             .postmaster(POSTMASTER)
-            .threads(5)
             .addProcessor(CommonProcessors.root())
             .addProcessor(CommonProcessors.error())
             .addProcessor(transport())

diff --git a/...gration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java b/...gration-testing/src/test/java/org/apache/james/mailets/CommonMailetConfigurationTest.java
@@ -55,7 +55,6 @@ public class CommonMailetConfigurationTest {
     public void setup() throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + DEFAULT_DOMAIN)
-            .threads(5)
             .addProcessor(CommonProcessors.root())
             .addProcessor(CommonProcessors.error())
             .addProcessor(CommonProcessors.transport())

diff --git a/...-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java b/...-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java
@@ -239,7 +239,6 @@ public void remoteDeliveryShouldBounceUponFailure() throws Exception {
             .withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
             .build(temporaryFolder, MailetContainer.builder()
                 .postmaster("postmaster@" + JAMES_APACHE_ORG)
-                .threads(5)
                 .addProcessor(root())
                 .addProcessor(CommonProcessors.error())
                 .addProcessor(relayAndLocalDeliveryTransport(gatewayProperty))
@@ -271,7 +270,6 @@ public void remoteDeliveryShouldBounceUponFailureWhenNoBounceProcessor() throws
             .withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
             .build(temporaryFolder, MailetContainer.builder()
                 .postmaster("postmaster@" + JAMES_APACHE_ORG)
-                .threads(5)
                 .addProcessor(root())
                 .addProcessor(CommonProcessors.error())
                 .addProcessor(ProcessorConfiguration.transport()
@@ -320,7 +318,6 @@ public void directResolutionShouldBeWellPerformed() throws Exception {
             .withOverrides(binder -> binder.bind(DNSService.class).toInstance(inMemoryDNSService))
             .build(temporaryFolder, MailetContainer.builder()
                 .postmaster("postmaster@" + JAMES_APACHE_ORG)
-                .threads(5)
                 .addProcessor(root())
                 .addProcessor(CommonProcessors.error())
                 .addProcessor(directResolutionTransport())
@@ -356,7 +353,6 @@ private boolean messageIsReceivedByTheSmtpServer() {
     private MailetContainer generateMailetContainerConfiguration(String gatewayProperty) {
         return MailetContainer.builder()
             .postmaster("postmaster@" + JAMES_APACHE_ORG)
-            .threads(5)
             .addProcessor(root())
             .addProcessor(CommonProcessors.error())
             .addProcessor(relayOnlyTransport(gatewayProperty))

diff --git a/...gration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java b/...gration-testing/src/test/java/org/apache/james/mailets/NetworkMatcherIntegrationTest.java
@@ -77,7 +77,6 @@ public void setup() throws Exception {
     private TemporaryJamesServer createJamesServerWithRootProcessor(ProcessorConfiguration.Builder rootProcessor) throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + JAMES_APACHE_ORG)
-            .threads(5)
             .addProcessor(rootProcessor)
             .addProcessor(CommonProcessors.error())
             .addProcessor(deliverOnlyTransport())

diff --git a/...-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java b/...-testing/src/test/java/org/apache/james/mailets/RecipientRewriteTableIntegrationTest.java
@@ -66,7 +66,6 @@ public class RecipientRewriteTableIntegrationTest {
     public void setup() throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + JAMES_APACHE_ORG)
-            .threads(5)
             .addProcessor(CommonProcessors.root())
             .addProcessor(CommonProcessors.error())
             .addProcessor(CommonProcessors.transport())

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
@@ -57,7 +57,6 @@ public class SieveDelivery {
     public void setup() throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + DEFAULT_DOMAIN)
-            .threads(5)
             .addProcessor(CommonProcessors.root())
             .addProcessor(CommonProcessors.error())
             .addProcessor(CommonProcessors.transport())

diff --git a/...t/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java b/...t/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
@@ -78,7 +78,6 @@ public void setup() throws Exception {
 
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + JAMES_APACHE_ORG)
-            .threads(5)
             .addProcessor(rootProcessor)
             .addProcessor(CommonProcessors.error())
             .addProcessor(deliverOnlyTransport())

diff --git a/...gration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java b/...gration-testing/src/test/java/org/apache/james/mailets/configuration/MailetContainer.java
@@ -21,6 +21,7 @@
 package org.apache.james.mailets.configuration;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
@@ -34,12 +35,14 @@ public static Builder builder() {
 
     public static class Builder {
 
+        public static final int DEFAULT_THREAD_COUNT = 5;
         private String postmaster;
-        private int threads;
+        private Optional<Integer> threads;
         private ImmutableList.Builder<ProcessorConfiguration> processors;
 
         private Builder() {
             processors = ImmutableList.builder();
+            threads = Optional.empty();
         }
 
         public Builder postmaster(String postmaster) {
@@ -48,7 +51,7 @@ public Builder postmaster(String postmaster) {
         }
 
         public Builder threads(int threads) {
-            this.threads = threads;
+            this.threads = Optional.of(threads);
             return this;
         }
 
@@ -63,6 +66,7 @@ public Builder addProcessor(ProcessorConfiguration.Builder processorConfiguratio
         }
 
         public MailetContainer build() {
+            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");
             return new MailetContainer(postmaster, threads, processors.build());

diff --git a/...on-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java b/...on-testing/src/test/java/org/apache/james/mailets/crypto/SMIMEDecryptIntegrationTest.java
@@ -73,7 +73,6 @@ public class SMIMEDecryptIntegrationTest {
     public void setup() throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + DEFAULT_DOMAIN)
-            .threads(5)
             .addProcessor(CommonProcessors.root())
             .addProcessor(CommonProcessors.error())
             .addProcessor(ProcessorConfiguration.transport()

diff --git a/...ation-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java b/...ation-testing/src/test/java/org/apache/james/mailets/crypto/SMIMESignIntegrationTest.java
@@ -79,7 +79,6 @@ public class SMIMESignIntegrationTest {
     public void setup() throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + DEFAULT_DOMAIN)
-            .threads(5)
             .addProcessor(CommonProcessors.root())
             .addProcessor(CommonProcessors.error())
             .addProcessor(ProcessorConfiguration.transport()

diff --git a/.../integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java b/.../integration-testing/src/test/java/org/apache/james/smtp/SmtpAuthorizedAddressesTest.java
@@ -109,7 +109,6 @@ public void setup() throws Exception {
     private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + DEFAULT_DOMAIN)
-            .threads(5)
             .addProcessor(ProcessorConfiguration.root()
                 .addMailet(MailetConfiguration.builder()
                     .matcher(All.class)

diff --git a/...t/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java b/...t/integration-testing/src/test/java/org/apache/james/smtp/SmtpBracketEnforcementTest.java
@@ -72,7 +72,6 @@ public void setup() throws Exception {
     private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + DEFAULT_DOMAIN)
-            .threads(5)
             .addProcessor(ProcessorConfiguration.root()
                 .addMailet(MailetConfiguration.builder()
                     .matcher(All.class)

diff --git a/...integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java b/...integration-testing/src/test/java/org/apache/james/smtp/SmtpIdentityVerificationTest.java
@@ -74,7 +74,6 @@ public void setup() throws Exception {
     private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + DEFAULT_DOMAIN)
-            .threads(5)
             .addProcessor(ProcessorConfiguration.root()
                 .addMailet(MailetConfiguration.builder()
                     .matcher(All.class)

diff --git a/...ailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java b/...ailet/integration-testing/src/test/java/org/apache/james/smtp/SmtpSizeLimitationTest.java
@@ -73,7 +73,6 @@ public void setup() throws Exception {
     private void createJamesServer(SmtpConfiguration.Builder smtpConfiguration) throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + DEFAULT_DOMAIN)
-            .threads(5)
             .addProcessor(ProcessorConfiguration.root()
                 .addMailet(MailetConfiguration.builder()
                     .matcher(All.class)

diff --git a/...n-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java b/...n-testing/src/test/java/org/apache/james/transport/mailets/AmqpForwardAttachmentTest.java
@@ -89,7 +89,6 @@ public class AmqpForwardAttachmentTest {
     public void setup() throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + JAMES_APACHE_ORG)
-            .threads(5)
             .addProcessor(CommonProcessors.root())
             .addProcessor(CommonProcessors.error())
             .addProcessor(ProcessorConfiguration.transport()

diff --git a/...ration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/...ration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java
@@ -77,9 +77,7 @@ public class ContactExtractorTest {
     @Before
     public void setup() throws Exception {
         String attribute = "ExtractedContacts";
-        MailetContainer mailets = MailetContainer
-            .builder()
-            .threads(5)
+        MailetContainer mailets = MailetContainer.builder()
             .postmaster(SENDER)
             .addProcessor(CommonProcessors.root())
             .addProcessor(CommonProcessors.error())

diff --git a/...ntegration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/...ntegration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java
@@ -109,7 +109,6 @@ public void setup() throws Exception {
 
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + DOMAIN1)
-            .threads(5)
             .addProcessor(ProcessorConfiguration.root()
                 .enableJmx(true)
                 .addMailet(MailetConfiguration.builder()

diff --git a/...n-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/...n-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -455,7 +455,6 @@ public class ICSAttachmentWorkflowTest {
     public void setup() throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + JAMES_APACHE_ORG)
-            .threads(5)
             .addProcessor(CommonProcessors.root())
             .addProcessor(CommonProcessors.error())
             .addProcessor(ProcessorConfiguration.transport()

diff --git a/...gration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java b/...gration-testing/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
@@ -73,7 +73,6 @@ public class StripAttachmentTest {
     public void setup() throws Exception {
         MailetContainer mailetContainer = MailetContainer.builder()
             .postmaster("postmaster@" + JAMES_APACHE_ORG)
-            .threads(5)
             .addProcessor(CommonProcessors.root())
             .addProcessor(CommonProcessors.error())
             .addProcessor(ProcessorConfiguration.transport()