This is an automated email from the ASF dual-hosted git repository.
rouazana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 4c73600 JAMES-2578 Fix warning using Mailet new API on
FakeMail.Builder
new c359840 Merge remote-tracking branch 'blackheaven/JAMES-2578-reboot-9'
4c73600 is described below
commit 4c736003ddad550d191f477166c3615181267802
Author: Gautier DI FOLCO <gdifo...@linagora.com>
AuthorDate: Tue Mar 5 10:16:55 2019 +0100
JAMES-2578 Fix warning using Mailet new API on FakeMail.Builder
---
.../apache/james/transport/mailets/ICALToHeader.java | 1 +
.../james/transport/mailets/ICALToHeadersTest.java | 18 ++++++++++++------
.../james/transport/mailets/ICalendarParserTest.java | 10 +++++++---
.../apache/james/transport/mailets/DSNBounceTest.java | 14 ++++++++------
.../james/transport/matchers/IsMarkedAsSpamTest.java | 3 ++-
.../webadmin/routes/MailRepositoriesRoutesTest.java | 5 +++--
6 files changed, 33 insertions(+), 18 deletions(-)
diff --git
a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
index 4a4df5d..025dfc3 100644
---
a/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
+++
b/mailet/icalendar/src/main/java/org/apache/james/transport/mailets/ICALToHeader.java
@@ -66,6 +66,7 @@ public class ICALToHeader extends GenericMailet {
public static final String ATTRIBUTE_PROPERTY = "attribute";
public static final String ATTRIBUTE_DEFAULT_NAME = "icalendar";
+ public static final AttributeName ATTRIBUTE_DEFAULT =
AttributeName.of(ATTRIBUTE_DEFAULT_NAME);
public static final String X_MEETING_UID_HEADER = "X-MEETING-UID";
public static final String X_MEETING_METHOD_HEADER = "X-MEETING-METHOD";
diff --git
a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToHeadersTest.java
b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToHeadersTest.java
index d49beed..79bd7ce 100644
---
a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToHeadersTest.java
+++
b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToHeadersTest.java
@@ -24,6 +24,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.MessagingException;
import org.apache.james.util.MimeMessageUtil;
+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.FakeMailetConfig;
@@ -103,7 +105,7 @@ public class ICALToHeadersTest {
Mail mail = FakeMail.builder()
.name("mail")
.mimeMessage(MimeMessageUtil.defaultMimeMessage())
- .attribute(ICALToHeader.ATTRIBUTE_DEFAULT_NAME, "This is the wrong
type")
+ .attribute(makeAttribute("This is the wrong type"))
.build();
testee.service(mail);
@@ -121,7 +123,7 @@ public class ICALToHeadersTest {
Mail mail = FakeMail.builder()
.name("mail")
.mimeMessage(MimeMessageUtil.defaultMimeMessage())
- .attribute(ICALToHeader.ATTRIBUTE_DEFAULT_NAME,
wrongParametrizedMap)
+ .attribute(makeAttribute(wrongParametrizedMap))
.build();
testee.service(mail);
@@ -140,7 +142,7 @@ public class ICALToHeadersTest {
Mail mail = FakeMail.builder()
.name("mail")
.mimeMessage(MimeMessageUtil.defaultMimeMessage())
- .attribute(ICALToHeader.ATTRIBUTE_DEFAULT_NAME, icals)
+ .attribute(makeAttribute(icals))
.build();
testee.service(mail);
@@ -164,7 +166,7 @@ public class ICALToHeadersTest {
Mail mail = FakeMail.builder()
.name("mail")
.mimeMessage(MimeMessageUtil.defaultMimeMessage())
- .attribute(ICALToHeader.ATTRIBUTE_DEFAULT_NAME, icals)
+ .attribute(makeAttribute(icals))
.build();
testee.service(mail);
@@ -190,7 +192,7 @@ public class ICALToHeadersTest {
Mail mail = FakeMail.builder()
.name("mail")
.mimeMessage(MimeMessageUtil.defaultMimeMessage())
- .attribute(ICALToHeader.ATTRIBUTE_DEFAULT_NAME, icals)
+ .attribute(makeAttribute(icals))
.build();
testee.service(mail);
@@ -207,11 +209,15 @@ public class ICALToHeadersTest {
Mail mail = FakeMail.builder()
.name("mail")
.mimeMessage(MimeMessageUtil.defaultMimeMessage())
- .attribute(ICALToHeader.ATTRIBUTE_DEFAULT_NAME, icals)
+ .attribute(makeAttribute(icals))
.build();
testee.service(mail);
assertThat(mail.getMessage().getHeader(ICALToHeader.X_MEETING_UID_HEADER)).isNull();
}
+
+ private Attribute makeAttribute(Object icals) {
+ return new Attribute(ICALToHeader.ATTRIBUTE_DEFAULT,
AttributeValue.ofAny(icals));
+ }
}
diff --git
a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
index dcfe209..117affa 100644
---
a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
+++
b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICalendarParserTest.java
@@ -197,7 +197,7 @@ public class ICalendarParserTest {
Mail mail = FakeMail.builder()
.name("mail")
- .attribute(SOURCE_CUSTOM_ATTRIBUTE, (Serializable) attachments)
+ .attribute(makeCustomSourceAttribute((Serializable) attachments))
.build();
mailet.service(mail);
@@ -225,7 +225,7 @@ public class ICalendarParserTest {
.build();
Mail mail = FakeMail.builder()
.name("mail")
- .attribute(SOURCE_CUSTOM_ATTRIBUTE, (Serializable) attachments)
+ .attribute(makeCustomSourceAttribute((Serializable) attachments))
.build();
mailet.service(mail);
@@ -259,7 +259,7 @@ public class ICalendarParserTest {
Mail mail = FakeMail.builder()
.name("mail")
- .attribute(SOURCE_CUSTOM_ATTRIBUTE, (Serializable) attachments)
+ .attribute(makeCustomSourceAttribute((Serializable) attachments))
.build();
mailet.service(mail);
@@ -269,4 +269,8 @@ public class ICalendarParserTest {
assertThat(calendars)
.hasSize(1));
}
+
+ private Attribute makeCustomSourceAttribute(Serializable attachments) {
+ return new Attribute(SOURCE_CUSTOM_ATTRIBUTE_NAME,
AttributeValue.ofSerializable(attachments));
+ }
}
diff --git
a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
index 0a76c6b..852d73d 100644
---
a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
+++
b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/DSNBounceTest.java
@@ -43,6 +43,7 @@ import org.apache.james.core.builder.MimeMessageBuilder;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.transport.mailets.redirect.SpecialAddress;
import org.apache.james.util.MimeMessageUtil;
+import org.apache.mailet.Attribute;
import org.apache.mailet.Mail;
import org.apache.mailet.base.DateFormats;
import org.apache.mailet.base.MailAddressFixture;
@@ -59,6 +60,7 @@ import org.junit.rules.ExpectedException;
public class DSNBounceTest {
private static final String MAILET_NAME = "mailetName";
+ private static final Attribute DELIVERY_ERROR_ATTRIBUTE =
Attribute.convertToAttribute("delivery-error", "Delivery error");
@Rule
public ExpectedException expectedException = ExpectedException.none();
@@ -159,7 +161,7 @@ public class DSNBounceTest {
FakeMail mail = FakeMail.builder()
.name(MAILET_NAME)
.sender(senderMailAddress)
- .attribute("delivery-error", "Delivery error")
+ .attribute(DELIVERY_ERROR_ATTRIBUTE)
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
.setText("My content"))
.recipient("recipi...@domain.com")
@@ -200,7 +202,7 @@ public class DSNBounceTest {
FakeMail mail = FakeMail.builder()
.name(MAILET_NAME)
.sender(senderMailAddress)
- .attribute("delivery-error", "Delivery error")
+ .attribute(DELIVERY_ERROR_ATTRIBUTE)
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
.setText("My content"))
.recipient("recipi...@domain.com")
@@ -239,7 +241,7 @@ public class DSNBounceTest {
FakeMail mail = FakeMail.builder()
.name(MAILET_NAME)
.sender(senderMailAddress)
- .attribute("delivery-error", "Delivery error")
+ .attribute(DELIVERY_ERROR_ATTRIBUTE)
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
.setText("My content"))
.recipient("recipi...@domain.com")
@@ -278,7 +280,7 @@ public class DSNBounceTest {
FakeMail mail = FakeMail.builder()
.name(MAILET_NAME)
- .attribute("delivery-error", "Delivery error")
+ .attribute(DELIVERY_ERROR_ATTRIBUTE)
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
.setText("My content"))
.recipient("recipi...@domain.com")
@@ -301,7 +303,7 @@ public class DSNBounceTest {
FakeMail mail = FakeMail.builder()
.name(MAILET_NAME)
- .attribute("delivery-error", "Delivery error")
+ .attribute(DELIVERY_ERROR_ATTRIBUTE)
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
.setText("My content"))
.recipient("recipi...@domain.com")
@@ -325,7 +327,7 @@ public class DSNBounceTest {
FakeMail mail = FakeMail.builder()
.name(MAILET_NAME)
- .attribute("delivery-error", "Delivery error")
+ .attribute(DELIVERY_ERROR_ATTRIBUTE)
.mimeMessage(MimeMessageBuilder.mimeMessageBuilder()
.setText("My content"))
.recipient("recipi...@domain.com")
diff --git
a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsMarkedAsSpamTest.java
b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsMarkedAsSpamTest.java
index 115747c..4d3210d 100644
---
a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsMarkedAsSpamTest.java
+++
b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/IsMarkedAsSpamTest.java
@@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Collection;
import org.apache.james.core.MailAddress;
+import org.apache.mailet.Attribute;
import org.apache.mailet.PerRecipientHeaders;
import org.apache.mailet.base.test.FakeMail;
import org.junit.Before;
@@ -111,7 +112,7 @@ public class IsMarkedAsSpamTest {
.value("Yes, hits=6.8 required=5.0")
.build(),
new MailAddress("t...@james.org"))
- .attribute("org.apache.james.spamassassin.status", "Yes, hits=6.8
required=5.0")
+
.attribute(Attribute.convertToAttribute("org.apache.james.spamassassin.status",
"Yes, hits=6.8 required=5.0"))
.build();
Collection<MailAddress> matches = matcher.match(mail);
diff --git
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
index 2c20f27..66cb847 100644
---
a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
+++
b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java
@@ -77,6 +77,7 @@ import
org.apache.james.webadmin.service.ReprocessingOneMailTask;
import org.apache.james.webadmin.service.ReprocessingService;
import org.apache.james.webadmin.utils.ErrorResponder;
import org.apache.james.webadmin.utils.JsonTransformer;
+import org.apache.mailet.Attribute;
import org.apache.mailet.Mail;
import org.apache.mailet.PerRecipientHeaders.Header;
import org.apache.mailet.base.test.FakeMail;
@@ -620,8 +621,8 @@ public class MailRepositoriesRoutesTest {
MailAddress recipientHeaderAddress = new MailAddress("third@party");
FakeMail mail = FakeMail.builder()
.name(name)
- .attribute("name1", "value1")
- .attribute("name2", "value2")
+ .attribute(Attribute.convertToAttribute("name1", "value1"))
+ .attribute(Attribute.convertToAttribute("name2", "value2"))
.mimeMessage(mimeMessage)
.size(42424242)
.addHeaderForRecipient(Header.builder()
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
