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/07/10 01:49:08 UTC
[james-project] 06/09: JAMES-3295 Matcher for permanent delivery
error
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 29cd7d4ed85e2f82a0c97125bb18942c608997d3
Author: LanKhuat <dl...@linagora.com>
AuthorDate: Wed Jul 8 15:14:40 2020 +0700
JAMES-3295 Matcher for permanent delivery error
---
.../matchers/IsRemoteDeliveryPermanentError.java | 55 +++++++++++
.../IsRemoteDeliveryPermanentErrorTest.java | 102 +++++++++++++++++++++
2 files changed, 157 insertions(+)
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsRemoteDeliveryPermanentError.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsRemoteDeliveryPermanentError.java
new file mode 100644
index 0000000..111a23c
--- /dev/null
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/matchers/IsRemoteDeliveryPermanentError.java
@@ -0,0 +1,55 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.transport.matchers;
+
+import static org.apache.james.transport.mailets.remote.delivery.Bouncer.IS_DELIVERY_PERMANENT_ERROR;
+
+import java.util.Collection;
+
+import org.apache.james.core.MailAddress;
+import org.apache.mailet.AttributeUtils;
+import org.apache.mailet.Mail;
+import org.apache.mailet.base.GenericMatcher;
+
+import com.google.common.collect.ImmutableList;
+
+/**
+ * <p>
+ * Checks if the mail has a permanent remote delivery failure attribute
+ * </p>
+ *
+ * Example:
+ *
+ * <pre><code>
+ * <mailet match="IsRemoteDeliveryPermanentError" class="<any-class>"/>
+ * </code></pre>
+ */
+public class IsRemoteDeliveryPermanentError extends GenericMatcher {
+
+ public static final AttributeName IS_DELIVERY_PERMANENT_ERROR = AttributeName.of("is-delivery-permanent-error");
+
+ @Override
+ public Collection<MailAddress> match(Mail mail) {
+ return AttributeUtils.getValueAndCastFromMail(mail, IS_DELIVERY_PERMANENT_ERROR, Boolean.class)
+ .filter(Boolean::booleanValue)
+ .map(any -> mail.getRecipients())
+ .orElse(ImmutableList.of());
+ }
+}
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsRemoteDeliveryPermanentErrorTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsRemoteDeliveryPermanentErrorTest.java
new file mode 100644
index 0000000..5c35156
--- /dev/null
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsRemoteDeliveryPermanentErrorTest.java
@@ -0,0 +1,102 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.transport.matchers;
+
+import static org.apache.james.transport.mailets.remote.delivery.Bouncer.IS_DELIVERY_PERMANENT_ERROR;
+import static org.apache.mailet.base.MailAddressFixture.RECIPIENT1;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Collection;
+
+import javax.mail.MessagingException;
+
+import org.apache.james.core.MailAddress;
+import org.apache.mailet.Attribute;
+import org.apache.mailet.AttributeValue;
+import org.apache.mailet.Mail;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMatcherConfig;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class IsRemoteDeliveryPermanentErrorTest {
+
+ private IsRemoteDeliveryPermanentError testee;
+
+ private Mail createMail() throws MessagingException {
+ return FakeMail.builder()
+ .name("test-message")
+ .recipient(RECIPIENT1)
+ .build();
+ }
+
+ @BeforeEach
+ void setUp() throws Exception {
+ testee = new IsRemoteDeliveryPermanentError();
+
+ FakeMatcherConfig matcherConfig = FakeMatcherConfig.builder()
+ .matcherName("IsRemoteDeliveryPermanentError")
+ .build();
+
+ testee.init(matcherConfig);
+ }
+
+ @Test
+ void shouldMatchWhenAttributeIsPresent() throws Exception {
+ Mail mail = createMail();
+ mail.setAttribute(new Attribute(IS_DELIVERY_PERMANENT_ERROR, AttributeValue.of(true)));
+
+ Collection<MailAddress> actual = testee.match(mail);
+
+ assertThat(actual).containsOnly(RECIPIENT1);
+ }
+
+ @Test
+ void shouldNotMatchWhenAttributeIsMissing() throws Exception {
+ Mail mail = createMail();
+
+ Collection<MailAddress> actual = testee.match(mail);
+
+ assertThat(actual).isEmpty();
+ }
+
+ @Test
+ void shouldNotMatchWhenAttributeIsFalse() throws Exception {
+ Mail mail = createMail();
+ mail.setAttribute(new Attribute(IS_DELIVERY_PERMANENT_ERROR, AttributeValue.of(false)));
+
+ Collection<MailAddress> actual = testee.match(mail);
+
+ assertThat(actual).isEmpty();
+ }
+
+ @ParameterizedTest
+ @ValueSource(strings = {"abc", "1"})
+ void shouldNotMatchWhenAttributeIsInvalid(String value) throws Exception {
+ Mail mail = createMail();
+ mail.setAttribute(new Attribute(IS_DELIVERY_PERMANENT_ERROR, AttributeValue.of(value)));
+
+ Collection<MailAddress> actual = testee.match(mail);
+
+ assertThat(actual).isEmpty();
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org