JAMES-2267 Introduce LocalDelivery as a common mailet
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0b7685ae Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0b7685ae Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0b7685ae Branch: refs/heads/master Commit: 0b7685aea44a173d5e67815cfd3b5247da892821 Parents: 95a3266 Author: benwa <[email protected]> Authored: Thu Dec 21 10:40:31 2017 +0700 Committer: benwa <[email protected]> Committed: Fri Jan 5 09:33:52 2018 +0700 ---------------------------------------------------------------------- .../james/mailets/GatewayRemoteDeliveryIntegrationTest.java | 4 +--- .../apache/james/mailets/NetworkMatcherIntegrationTest.java | 5 +---- .../org/apache/james/mailets/SmtpAuthIntegrationTest.java | 5 +---- .../james/mailets/configuration/MailetConfiguration.java | 7 +++++++ .../james/mailets/crypto/SMIMEDecryptIntegrationTest.java | 6 +----- .../apache/james/mailets/crypto/SMIMESignIntegrationTest.java | 6 +----- .../org/apache/james/smtp/SmtpAuthorizedAddressesTest.java | 6 +----- .../org/apache/james/smtp/SmtpBracketEnforcementTest.java | 6 +----- .../org/apache/james/smtp/SmtpIdentityVerificationTest.java | 6 +----- .../java/org/apache/james/smtp/SmtpSizeLimitationTest.java | 6 +----- .../james/transport/mailets/AmqpForwardAttachmentTest.java | 5 +---- .../apache/james/transport/mailets/ContactExtractorTest.java | 5 +---- .../org/apache/james/transport/mailets/GroupMappingTest.java | 4 +--- .../james/transport/mailets/ICSAttachmentWorkflowTest.java | 5 +---- .../apache/james/transport/mailets/StripAttachmentTest.java | 5 +---- 15 files changed, 21 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/GatewayRemoteDeliveryIntegrationTest.java ---------------------------------------------------------------------- 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 bb95936..7bfc074 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 @@ -251,9 +251,7 @@ public class GatewayRemoteDeliveryIntegrationTest { .addProcessor(CommonProcessors.error()) .addProcessor(ProcessorConfiguration.transport() .addMailet(MailetConfiguration.BCC_STRIPPER) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class)) + .addMailet(MailetConfiguration.LOCAL_DELIVERY) .addMailet(MailetConfiguration.builder() .matcher(All.class) .mailet(RemoteDelivery.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 40d5197..da7c3d8 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 @@ -33,7 +33,6 @@ import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.probe.DataProbe; -import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.transport.mailets.ToProcessor; import org.apache.james.transport.mailets.ToRepository; import org.apache.james.transport.matchers.All; @@ -79,9 +78,7 @@ public class NetworkMatcherIntegrationTest { private ProcessorConfiguration deliverOnlyTransport() { return ProcessorConfiguration.transport() .addMailet(MailetConfiguration.BCC_STRIPPER) - .addMailet(MailetConfiguration.builder() - .matcher(All.class) - .mailet(LocalDelivery.class)) + .addMailet(MailetConfiguration.LOCAL_DELIVERY) .build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 64b5d93..a3b7eae 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 @@ -33,7 +33,6 @@ import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.probe.DataProbe; -import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.transport.mailets.ToProcessor; import org.apache.james.transport.mailets.ToRepository; import org.apache.james.transport.matchers.All; @@ -97,9 +96,7 @@ public class SmtpAuthIntegrationTest { private ProcessorConfiguration deliverOnlyTransport() { return ProcessorConfiguration.transport() .addMailet(MailetConfiguration.BCC_STRIPPER) - .addMailet(MailetConfiguration.builder() - .matcher(All.class) - .mailet(LocalDelivery.class)) + .addMailet(MailetConfiguration.LOCAL_DELIVERY) .build(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java index ead2e08..9241aa4 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/configuration/MailetConfiguration.java @@ -23,8 +23,10 @@ package org.apache.james.mailets.configuration; import java.util.Map; import java.util.Optional; +import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.transport.mailets.RemoveMimeHeader; import org.apache.james.transport.matchers.All; +import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.mailet.Mailet; import org.apache.mailet.Matcher; @@ -83,6 +85,11 @@ public class MailetConfiguration implements SerializableAsXml { .addProperty("name", "bcc") .build(); + public static final MailetConfiguration LOCAL_DELIVERY = MailetConfiguration.builder() + .matcher(RecipientIsLocal.class) + .mailet(LocalDelivery.class) + .build(); + private final Class<? extends Matcher> matcher; private final Optional<String> matcherCondition; private final Class<? extends Mailet> mailet; http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 148ba17..2d2275d 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 @@ -33,10 +33,8 @@ import org.apache.james.mailets.configuration.CommonProcessors; import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; -import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.transport.mailets.SMIMEDecrypt; import org.apache.james.transport.matchers.All; -import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.util.ClassLoaderUtils; import org.apache.james.util.date.ZonedDateTimeProvider; import org.apache.james.utils.DataProbeImpl; @@ -77,9 +75,7 @@ public class SMIMEDecryptIntegrationTest { .addProperty("keyStorePassword", "secret") .addProperty("keyStoreType", "PKCS12") .addProperty("debug", "true")) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class))) + .addMailet(MailetConfiguration.LOCAL_DELIVERY)) .build(); jamesServer = TemporaryJamesServer.builder() http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 4d6ec0b..ebf46f8 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 @@ -35,11 +35,9 @@ import org.apache.james.mailets.configuration.MailetConfiguration; import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.probe.DataProbe; -import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.transport.mailets.SMIMESign; import org.apache.james.transport.mailets.SetMimeHeader; import org.apache.james.transport.matchers.HasMailAttribute; -import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.transport.matchers.SenderIsLocal; import org.apache.james.util.date.ZonedDateTimeProvider; import org.apache.james.utils.DataProbeImpl; @@ -87,9 +85,7 @@ public class SMIMESignIntegrationTest { .addProperty("keyStorePassword", "secret") .addProperty("keyStoreType", "PKCS12") .addProperty("debug", "true")) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class))) + .addMailet(MailetConfiguration.LOCAL_DELIVERY)) .addProcessor(CommonProcessors.spam()) .addProcessor(CommonProcessors.localAddressError()) .addProcessor(CommonProcessors.relayDenied()) http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 571e3c3..0af382f 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 @@ -36,11 +36,9 @@ import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.mailets.configuration.SmtpConfiguration; import org.apache.james.probe.DataProbe; -import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.transport.mailets.RemoteDelivery; import org.apache.james.transport.mailets.ToProcessor; import org.apache.james.transport.matchers.All; -import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.transport.matchers.SMTPIsAuthNetwork; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.SwarmGenericContainer; @@ -97,9 +95,7 @@ public class SmtpAuthorizedAddressesTest { .addProcessor(CommonProcessors.error()) .addProcessor(ProcessorConfiguration.transport() .addMailet(MailetConfiguration.BCC_STRIPPER) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class)) + .addMailet(MailetConfiguration.LOCAL_DELIVERY) .addMailet(MailetConfiguration.builder() .matcher(SMTPIsAuthNetwork.class) .mailet(RemoteDelivery.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 468b078..30d2783 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 @@ -33,10 +33,8 @@ import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.mailets.configuration.SmtpConfiguration; import org.apache.james.probe.DataProbe; -import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.transport.mailets.ToProcessor; import org.apache.james.transport.matchers.All; -import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.SMTPMessageSender; import org.junit.After; @@ -64,9 +62,7 @@ public class SmtpBracketEnforcementTest { .addProcessor(CommonProcessors.error()) .addProcessor(ProcessorConfiguration.transport() .addMailet(MailetConfiguration.BCC_STRIPPER) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class)) + .addMailet(MailetConfiguration.LOCAL_DELIVERY) .addMailet(MailetConfiguration.builder() .matcher(All.class) .mailet(ToProcessor.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 cda3ad2..677d827 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 @@ -33,10 +33,8 @@ import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.mailets.configuration.SmtpConfiguration; import org.apache.james.probe.DataProbe; -import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.transport.mailets.ToProcessor; import org.apache.james.transport.matchers.All; -import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.SMTPMessageSender; import org.junit.After; @@ -67,9 +65,7 @@ public class SmtpIdentityVerificationTest { .addProcessor(CommonProcessors.error()) .addProcessor(ProcessorConfiguration.transport() .addMailet(MailetConfiguration.BCC_STRIPPER) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class))) + .addMailet(MailetConfiguration.LOCAL_DELIVERY)) .addProcessor(CommonProcessors.localAddressError()) .addProcessor(CommonProcessors.relayDenied()) .addProcessor(CommonProcessors.bounces()) http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 a7df9d2..657cdc3 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 @@ -33,10 +33,8 @@ import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.mailets.configuration.SmtpConfiguration; import org.apache.james.probe.DataProbe; -import org.apache.james.transport.mailets.LocalDelivery; import org.apache.james.transport.mailets.ToProcessor; import org.apache.james.transport.matchers.All; -import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.SMTPMessageSender; import org.junit.After; @@ -66,9 +64,7 @@ public class SmtpSizeLimitationTest { .addProcessor(CommonProcessors.error()) .addProcessor(ProcessorConfiguration.transport() .addMailet(MailetConfiguration.BCC_STRIPPER) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class)) + .addMailet(MailetConfiguration.LOCAL_DELIVERY) .addMailet(MailetConfiguration.builder() .matcher(All.class) .mailet(ToProcessor.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 18e8c0e..2d4dd3f 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 @@ -38,7 +38,6 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.probe.DataProbe; import org.apache.james.transport.mailets.amqp.AmqpRule; import org.apache.james.transport.matchers.All; -import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.SwarmGenericContainer; import org.apache.james.utils.DataProbeImpl; @@ -101,9 +100,7 @@ public class AmqpForwardAttachmentTest { .addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE_NAME) .addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, MAIL_ATTRIBUTE) .addProperty(AmqpForwardAttribute.ROUTING_KEY_PARAMETER_NAME, ROUTING_KEY)) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class))) + .addMailet(MailetConfiguration.LOCAL_DELIVERY)) .build(); jamesServer = TemporaryJamesServer.builder() http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java ---------------------------------------------------------------------- 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 822a7ce..335b3cd 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 @@ -37,7 +37,6 @@ import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.transport.mailets.amqp.AmqpRule; import org.apache.james.transport.matchers.All; -import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.transport.matchers.SMTPAuthSuccessful; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.SwarmGenericContainer; @@ -97,9 +96,7 @@ public class ContactExtractorTest { .addProperty(AmqpForwardAttribute.EXCHANGE_PARAMETER_NAME, EXCHANGE) .addProperty(AmqpForwardAttribute.ATTRIBUTE_PARAMETER_NAME, attribute)) .addMailet(MailetConfiguration.BCC_STRIPPER) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class))) + .addMailet(MailetConfiguration.LOCAL_DELIVERY)) .build(); jamesServer = TemporaryJamesServer.builder() .withBase(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE) http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 7e1d3ee..bb9880f 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 @@ -125,9 +125,7 @@ public class GroupMappingTest { .addMailet(MailetConfiguration.builder() .matcher(RecipientIsLocal.class) .mailet(VacationMailet.class)) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class)) + .addMailet(MailetConfiguration.LOCAL_DELIVERY) .addMailet(MailetConfiguration.builder() .matcher(All.class) .mailet(RemoteDelivery.class) http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 3532f4b..c035991 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 @@ -42,7 +42,6 @@ import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.probe.DataProbe; import org.apache.james.transport.mailets.amqp.AmqpRule; import org.apache.james.transport.matchers.All; -import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.util.docker.Images; import org.apache.james.util.docker.SwarmGenericContainer; import org.apache.james.utils.DataProbeImpl; @@ -486,9 +485,7 @@ public class ICSAttachmentWorkflowTest { .addProperty("exchange", EXCHANGE_NAME) .addProperty("attribute", JSON_MAIL_ATTRIBUTE) .addProperty("routing_key", ROUTING_KEY)) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class))) + .addMailet(MailetConfiguration.LOCAL_DELIVERY)) .build(); jamesServer = TemporaryJamesServer.builder() http://git-wip-us.apache.org/repos/asf/james-project/blob/0b7685ae/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 4929ca8..03d45b4 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 @@ -37,7 +37,6 @@ import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.mailets.configuration.ProcessorConfiguration; import org.apache.james.probe.DataProbe; import org.apache.james.transport.matchers.All; -import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.SMTPMessageSender; @@ -82,9 +81,7 @@ public class StripAttachmentTest { .matcher(All.class) .mailet(RecoverAttachment.class) .addProperty("attribute", "my.attribute")) - .addMailet(MailetConfiguration.builder() - .matcher(RecipientIsLocal.class) - .mailet(LocalDelivery.class))) + .addMailet(MailetConfiguration.LOCAL_DELIVERY)) .build(); jamesServer = TemporaryJamesServer.builder() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
