MAILBOX-288 Removing all MIME4J limitations on other uses

apache · Feb 28, 2017 · 8164bad · 8164bad
1 parent 3602b25
commit 8164bad
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MimeDescriptorImpl.java
@@ -45,6 +45,13 @@
 public class MimeDescriptorImpl implements MimeDescriptor {
 
     private final static Charset US_ASCII = Charset.forName("US-ASCII");
+    private static final MimeConfig MIME_ENTITY_CONFIG = MimeConfig.custom()
+        .setMaxContentLen(-1)
+        .setMaxHeaderCount(-1)
+        .setMaxHeaderLen(-1)
+        .setMaxHeaderCount(-1)
+        .setMaxLineLen(-1)
+        .build();
 
 
     /**
@@ -62,9 +69,8 @@ public static boolean isComposite(String mediaType) {
     public static MimeDescriptorImpl build(InputStream stream) throws IOException, MimeException {
         // Disable line length limit
         // See https://issues.apache.org/jira/browse/IMAP-132
-        MimeConfig config = MimeConfig.custom().setMaxLineLen(-1).setMaxHeaderLen(-1).build();
         //
-        final MimeTokenStream parser = new MimeTokenStream(config, new DefaultBodyDescriptorBuilder());
+        final MimeTokenStream parser = new MimeTokenStream(MIME_ENTITY_CONFIG, new DefaultBodyDescriptorBuilder());
 
         parser.parse(stream);
 

diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/streaming/PartContentBuilder.java
@@ -40,6 +40,14 @@
 
 public class PartContentBuilder {
 
+    private static final MimeConfig MIME_ENTITY_CONFIG = MimeConfig.custom()
+        .setMaxContentLen(-1)
+        .setMaxHeaderCount(-1)
+        .setMaxHeaderLen(-1)
+        .setMaxHeaderCount(-1)
+        .setMaxLineLen(-1)
+        .build();
+
     private static final byte[] EMPTY = {};
 
     private final MimeTokenStream parser;
@@ -49,9 +57,7 @@ public class PartContentBuilder {
     private boolean topLevel = true;
 
     public PartContentBuilder() {
-        MimeConfig config = MimeConfig.custom().setMaxLineLen(-1).setMaxHeaderLen(-1).build();
-
-        parser = new MimeTokenStream(config);
+        parser = new MimeTokenStream(MIME_ENTITY_CONFIG);
     }
 
     public void markEmpty() {