Skip to content

Commit

Permalink
JAMES-2034 switch apache-mime4j.version from 0.8.0 to 0.8.1-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
@chibenwa
Luc DUZAN authored and chibenwa committed May 31, 2017
1 parent d76e3c0 commit 83019ff
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 29 deletions.
46 changes: 23 additions & 23 deletions ...iner/util-java8/src/test/java/org/apache/james/util/mime/MessageContentExtractorTest.java
View file
Expand Up @@ -33,8 +33,8 @@
import org.apache.james.mime4j.message.BodyPart;
import org.apache.james.mime4j.message.BodyPartBuilder;
import org.apache.james.mime4j.message.HeaderImpl;
import org.apache.james.mime4j.message.MessageBuilder;
import org.apache.james.mime4j.message.MultipartBuilder;
import org.apache.james.mime4j.dom.Message;
import org.apache.james.mime4j.stream.Field;
import org.apache.james.mime4j.util.ByteSequence;
import org.apache.james.util.mime.MessageContentExtractor.MessageContent;
Expand Down Expand Up @@ -97,7 +97,7 @@ public void setup() throws IOException {

@Test
public void extractShouldReturnEmptyWhenBinaryContentOnly() throws IOException {
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(BasicBodyFactory.INSTANCE.binaryBody(BINARY_CONTENT, Charsets.UTF_8))
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -107,7 +107,7 @@ public void extractShouldReturnEmptyWhenBinaryContentOnly() throws IOException {

@Test
public void extractShouldReturnTextOnlyWhenTextOnlyBody() throws IOException {
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(TEXT_CONTENT, Charsets.UTF_8)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -117,7 +117,7 @@ public void extractShouldReturnTextOnlyWhenTextOnlyBody() throws IOException {

@Test
public void extractShouldReturnHtmlOnlyWhenHtmlOnlyBody() throws IOException {
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(HTML_CONTENT, "html", Charsets.UTF_8)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -131,7 +131,7 @@ public void extractShouldReturnHtmlAndTextWhenMultipartAlternative() throws IOEx
.addBodyPart(textPart)
.addBodyPart(htmlPart)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -144,7 +144,7 @@ public void extractShouldReturnHtmlWhenMultipartAlternativeWithoutPlainPart() th
Multipart multipart = MultipartBuilder.create("alternative")
.addBodyPart(htmlPart)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -157,7 +157,7 @@ public void extractShouldReturnTextWhenMultipartAlternativeWithoutHtmlPart() thr
Multipart multipart = MultipartBuilder.create("alternative")
.addBodyPart(textPart)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -172,7 +172,7 @@ public void extractShouldReturnFirstNonAttachmentPartWhenMultipartMixed() throws
.addBodyPart(htmlPart)
.addBodyPart(textPart)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -193,7 +193,7 @@ public void extractShouldReturnInlinedTextBodyWithoutCIDWhenNoOtherValidParts()
.setContentDisposition("inline")
.build())
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipart)
.build();

Expand All @@ -207,7 +207,7 @@ public void extractShouldReturnEmptyWhenMultipartMixedAndFirstPartIsATextAttachm
Multipart multipart = MultipartBuilder.create("mixed")
.addBodyPart(textAttachment)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -221,7 +221,7 @@ public void extractShouldReturnFirstPartOnlyWhenMultipartMixedAndFirstPartIsHtml
.addBodyPart(htmlPart)
.addBodyPart(textPart)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -240,7 +240,7 @@ public void extractShouldReturnHtmlAndTextWhenMultipartMixedAndFirstPartIsMultip
Multipart multipartMixed = MultipartBuilder.create("mixed")
.addBodyPart(multipartAlternative)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipartMixed)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -253,7 +253,7 @@ public void extractShouldReturnHtmlWhenMultipartRelated() throws IOException {
Multipart multipart = MultipartBuilder.create("related")
.addBodyPart(htmlPart)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipart)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -271,7 +271,7 @@ public void extractShouldReturnHtmlAndTextWhenMultipartAlternativeAndFirstPartIs
Multipart multipartAlternative = MultipartBuilder.create("alternative")
.addBodyPart(multipartRelated)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -291,7 +291,7 @@ public void extractShouldRetrieveHtmlBodyWithOneInlinedHTMLAttachmentWithoutCid(
Multipart multipartAlternative = MultipartBuilder.create("alternative")
.addBodyPart(inlinedHTMLPart)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();

Expand All @@ -316,7 +316,7 @@ public void extractShouldNotRetrieveHtmlBodyWithOneInlinedHTMLAttachmentWithCid(
Multipart multipartAlternative = MultipartBuilder.create("alternative")
.addBodyPart(inlinedHTMLPart)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();

Expand All @@ -341,7 +341,7 @@ public void extractShouldRetrieveTextBodyWithOneInlinedTextAttachmentWithoutCid(
Multipart multipartAlternative = MultipartBuilder.create("alternative")
.addBodyPart(inlinedTextPart)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();

Expand All @@ -366,7 +366,7 @@ public void extractShouldNotRetrieveTextBodyWithOneInlinedTextAttachmentWithCid(
Multipart multipartAlternative = MultipartBuilder.create("alternative")
.addBodyPart(inlinedTextPart)
.build();
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();

Expand All @@ -391,7 +391,7 @@ public void extractShouldRetrieveTextAndHtmlBodyWhenOneInlinedTextAttachmentAndM
.addBodyPart(inlineText)
.build();

Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipartMixed)
.build();

Expand All @@ -414,7 +414,7 @@ public void extractShouldRetrieveTextBodyAndHtmlBodyWhenTextBodyInMainMultipartA
.addBodyPart(multipartRelated)
.build();

Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(multipartAlternative)
.build();

Expand Down Expand Up @@ -492,7 +492,7 @@ public void mergeMessageContentShouldReturnFirstWhenTwiceAreComplete() {
@Test
public void extractShouldRespectCharsetWhenOtherThanUTF8() throws IOException {
String text = "éééé\r\nèèèè\r\nàààà";
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(text, Charset.forName("windows-1252"))
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -502,7 +502,7 @@ public void extractShouldRespectCharsetWhenOtherThanUTF8() throws IOException {
@Test
public void extractShouldRespectCharsetWhenUTF8() throws IOException {
String text = "éééé\r\nèèèè\r\nàààà";
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(text, Charsets.UTF_8)
.build();
MessageContent actual = testee.extract(message);
Expand All @@ -512,7 +512,7 @@ public void extractShouldRespectCharsetWhenUTF8() throws IOException {
@Test
public void extractShouldUseUSASCIIWhenNoCharset() throws IOException {
String text = "éééé\r\nèèèè\r\nàààà";
Message message = MessageBuilder.create()
Message message = Message.Builder.of()
.setBody(text, null)
.build();
MessageContent actual = testee.extract(message);
Expand Down
2 changes: 1 addition & 1 deletion server/pom.xml
View file
Expand Up @@ -119,7 +119,7 @@
<productName>Apache-James Mail Server</productName>

<activemq.version>5.10.2</activemq.version>
<apache-mime4j.version>0.8.0</apache-mime4j.version>
<apache-mime4j.version>0.8.1-SNAPSHOT</apache-mime4j.version>
<camel.version>2.13.4</camel.version>
<derby.version>10.9.1.0</derby.version>
<hadoop.version>1.1.1</hadoop.version>
Expand Down
4 changes: 2 additions & 2 deletions server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java
View file
Expand Up @@ -134,8 +134,8 @@ private Optional<String> mainTextContent(MessageContent messageContent) {

private org.apache.james.mime4j.dom.Message parse(MetaDataWithContent message) throws MailboxException {
try {
return MessageBuilder
.create()
return org.apache.james.mime4j.dom.Message.Builder
.of()
.use(MIME_ENTITY_CONFIG)
.parse(message.getContent())
.build();
Expand Down
3 changes: 0 additions & 3 deletions server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
View file
Expand Up @@ -71,7 +71,6 @@ public void setUp() {
}

@Test
@Ignore
public void emptyMailShouldBeLoadedIntoMessage() throws Exception {
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
Expand Down Expand Up @@ -113,7 +112,6 @@ public void flagsShouldBeSetIntoMessage() throws Exception {
}

@Test
@Ignore
public void headersShouldBeSetIntoMessage() throws Exception {
String headers = "From: user <user@domain>\n"
+ "Subject: test subject\n"
Expand Down Expand Up @@ -341,7 +339,6 @@ public void invalidAddressesShouldBeAllowed() throws Exception {
}

@Test
@Ignore
public void mailWithBigLinesShouldBeLoadedIntoMessage() throws Exception {
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
Expand Down

0 comments on commit 83019ff

Please sign in to comment.