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 c07018313f4b5596b518603ee971d9585634bc3c
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Wed Jan 15 15:38:15 2025 +0100
JAMES-4103 MessageParser => MessageParserImpl
---
.../mailbox/cassandra/CassandraMailboxManager.java | 4 +-
.../mailbox/cassandra/CassandraMessageManager.java | 4 +-
.../cassandra/CassandraMailboxManagerProvider.java | 4 +-
.../cassandra/CassandraTestSystemFixture.java | 4 +-
.../CassandraMailboxManagerAttachmentTest.java | 6 +-
.../model/openjpa/AbstractJPAMailboxMessage.java | 4 +-
.../mailbox/jpa/openjpa/OpenJPAMailboxManager.java | 4 +-
.../mailbox/jpa/JpaMailboxManagerProvider.java | 4 +-
.../mailbox/inmemory/InMemoryMailboxManager.java | 4 +-
.../mailbox/inmemory/InMemoryMessageManager.java | 4 +-
.../mail/InMemoryMailboxManagerAttachmentTest.java | 4 +-
.../resources/META-INF/spring/spring-mailbox.xml | 2 +-
.../apache/james/mailbox/store/MessageStorer.java | 14 ++--
.../james/mailbox/store/StoreMailboxManager.java | 8 +--
.../{MessageParser.java => MessageParserImpl.java} | 6 +-
.../mailbox/store/StoreMailboxManagerTest.java | 4 +-
...eParserTest.java => MessageParserImplTest.java} | 74 +++++++++++-----------
.../cassandra/host/CassandraHostSystem.java | 4 +-
.../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 4 +-
.../META-INF/org/apache/james/spring-server.xml | 2 +-
20 files changed, 82 insertions(+), 82 deletions(-)
diff --git
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
index fe1dac1827..0afe54b9b6 100644
---
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
+++
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxManager.java
@@ -38,7 +38,7 @@ import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreMessageManager;
import org.apache.james.mailbox.store.StoreRightManager;
import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
@@ -62,7 +62,7 @@ public class CassandraMailboxManager extends
StoreMailboxManager {
@Inject
public CassandraMailboxManager(CassandraMailboxSessionMapperFactory
mapperFactory, SessionProvider sessionProvider,
- MailboxPathLocker locker, MessageParser
messageParser,
+ MailboxPathLocker locker, MessageParserImpl
messageParser,
MessageId.Factory messageIdFactory,
EventBus eventBus,
StoreMailboxAnnotationManager
annotationManager, StoreRightManager storeRightManager,
QuotaComponents quotaComponents,
MessageSearchIndex index,
diff --git
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java
index 73862b6e55..fc5fdf0fb9 100644
---
a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java
+++
b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMessageManager.java
@@ -37,7 +37,7 @@ import org.apache.james.mailbox.store.PreDeletionHooks;
import org.apache.james.mailbox.store.StoreMessageManager;
import org.apache.james.mailbox.store.StoreRightManager;
import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
/**
@@ -47,7 +47,7 @@ public class CassandraMessageManager extends
StoreMessageManager {
CassandraMessageManager(CassandraMailboxSessionMapperFactory
mapperFactory, MessageSearchIndex index,
EventBus eventBus, MailboxPathLocker locker,
Mailbox mailbox, QuotaManager quotaManager,
- QuotaRootResolver quotaRootResolver, MessageParser
messageParser, MessageId.Factory messageIdFactory,
+ QuotaRootResolver quotaRootResolver,
MessageParserImpl messageParser, MessageId.Factory messageIdFactory,
BatchSizes batchSizes,
StoreRightManager storeRightManager,
PreDeletionHooks preDeletionHooks,
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java
index cbdf9bfb2e..8e66b4c286 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java
@@ -52,7 +52,7 @@ import
org.apache.james.mailbox.store.event.MailboxAnnotationListener;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm;
import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver;
import org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater;
import org.apache.james.mailbox.store.quota.QuotaComponents;
@@ -106,7 +106,7 @@ public class CassandraMailboxManagerProvider {
ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm,
Clock clock) {
MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
- MessageParser messageParser = new MessageParser();
+ MessageParserImpl messageParser = new MessageParserImpl();
InVMEventBus eventBus = new InVMEventBus(new InVmEventDelivery(new
RecordingMetricFactory()), EventBusTestFixture.RETRY_BACKOFF_CONFIGURATION, new
MemoryEventDeadLetters());
StoreRightManager storeRightManager = new
StoreRightManager(mapperFactory, aclResolver, eventBus);
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java
index a843ec7daf..143e4d6520 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java
@@ -52,7 +52,7 @@ import org.apache.james.mailbox.store.StoreRightManager;
import org.apache.james.mailbox.store.event.MailboxAnnotationListener;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
@@ -79,7 +79,7 @@ public class CassandraTestSystemFixture {
AttachmentContentLoader attachmentContentLoader = null;
MessageSearchIndex index = new SimpleMessageSearchIndex(mapperFactory,
mapperFactory, new DefaultTextExtractor(), attachmentContentLoader);
CassandraMailboxManager cassandraMailboxManager = new
CassandraMailboxManager(mapperFactory, sessionProvider,
- new NoMailboxPathLocker(), new MessageParser(), new
CassandraMessageId.Factory(),
+ new NoMailboxPathLocker(), new MessageParserImpl(), new
CassandraMessageId.Factory(),
eventBus, annotationManager, storeRightManager, quotaComponents,
index, MailboxManagerConfiguration.DEFAULT,
PreDeletionHooks.NO_PRE_DELETION_HOOK,
new NaiveThreadIdGuessingAlgorithm(), new
UpdatableTickingClock(Instant.now()));
diff --git
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
index a0e3b7e50c..b07e555dcd 100644
---
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
+++
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
@@ -51,7 +51,7 @@ import
org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.james.mailbox.store.mail.AttachmentMapperFactory;
import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm;
import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
import org.apache.james.mailbox.store.search.SimpleMessageSearchIndex;
@@ -92,10 +92,10 @@ class CassandraMailboxManagerAttachmentTest extends
AbstractMailboxManagerAttach
AttachmentContentLoader attachmentContentLoader = null;
MessageSearchIndex index = new
SimpleMessageSearchIndex(mailboxSessionMapperFactory,
mailboxSessionMapperFactory, new DefaultTextExtractor(),
attachmentContentLoader);
- mailboxManager = new
CassandraMailboxManager(mailboxSessionMapperFactory, sessionProvider, new
NoMailboxPathLocker(), new MessageParser(),
+ mailboxManager = new
CassandraMailboxManager(mailboxSessionMapperFactory, sessionProvider, new
NoMailboxPathLocker(), new MessageParserImpl(),
messageIdFactory, eventBus, annotationManager, storeRightManager,
quotaComponents,
index, MailboxManagerConfiguration.DEFAULT,
PreDeletionHooks.NO_PRE_DELETION_HOOK, threadIdGuessingAlgorithm, new
UpdatableTickingClock(Instant.now()));
- MessageParser failingMessageParser = mock(MessageParser.class);
+ MessageParserImpl failingMessageParser = mock(MessageParserImpl.class);
when(failingMessageParser.retrieveAttachments(any(InputStream.class)))
.thenThrow(new RuntimeException("Message parser set to fail"));
parseFailingMailboxManager = new
CassandraMailboxManager(mailboxSessionMapperFactory, sessionProvider,
diff --git
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
index f8af181a02..e8335f2938 100644
---
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
+++
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
@@ -61,7 +61,7 @@ import
org.apache.james.mailbox.store.mail.model.DelegatingMailboxMessage;
import org.apache.james.mailbox.store.mail.model.FlagsFactory;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.Property;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.mail.model.impl.Properties;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.openjpa.persistence.jdbc.ElementJoinColumn;
@@ -558,7 +558,7 @@ public abstract class AbstractJPAMailboxMessage implements
MailboxMessage {
public List<MessageAttachmentMetadata> getAttachments() {
try {
AtomicInteger counter = new AtomicInteger(0);
- MessageParser.ParsingResult parsingResult = new
MessageParser().retrieveAttachments(getFullContent());
+ MessageParserImpl.ParsingResult parsingResult = new
MessageParserImpl().retrieveAttachments(getFullContent());
ImmutableList<MessageAttachmentMetadata> result = parsingResult
.getAttachments()
.stream()
diff --git
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java
index b82d46ba98..06145be925 100644
---
a/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java
+++
b/mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMailboxManager.java
@@ -38,7 +38,7 @@ import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreMessageManager;
import org.apache.james.mailbox.store.StoreRightManager;
import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
@@ -55,7 +55,7 @@ public class OpenJPAMailboxManager extends
StoreMailboxManager {
@Inject
public OpenJPAMailboxManager(JPAMailboxSessionMapperFactory mapperFactory,
SessionProvider sessionProvider,
- MessageParser messageParser,
+ MessageParserImpl messageParser,
MessageId.Factory messageIdFactory,
EventBus eventBus,
StoreMailboxAnnotationManager
annotationManager,
diff --git
a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java
b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java
index 405dba6341..1425766503 100644
---
a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java
+++
b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java
@@ -42,7 +42,7 @@ import org.apache.james.mailbox.store.StoreRightManager;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm;
import org.apache.james.mailbox.store.mail.model.DefaultMessageId;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
import org.apache.james.mailbox.store.search.SimpleMessageSearchIndex;
@@ -66,7 +66,7 @@ public class JpaMailboxManagerProvider {
JPAMailboxSessionMapperFactory mf = new
JPAMailboxSessionMapperFactory(entityManagerFactory, new
JPAUidProvider(entityManagerFactory), new
JPAModSeqProvider(entityManagerFactory), jpaConfiguration);
MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
- MessageParser messageParser = new MessageParser();
+ MessageParserImpl messageParser = new MessageParserImpl();
Authenticator noAuthenticator = null;
Authorizator noAuthorizator = null;
diff --git
a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
index aa350a8a69..062766afd7 100644
---
a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
+++
b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManager.java
@@ -38,7 +38,7 @@ import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreMessageManager;
import org.apache.james.mailbox.store.StoreRightManager;
import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
@@ -54,7 +54,7 @@ public class InMemoryMailboxManager extends
StoreMailboxManager {
@Inject
public InMemoryMailboxManager(MailboxSessionMapperFactory
mailboxSessionMapperFactory, SessionProvider sessionProvider,
- MailboxPathLocker locker, MessageParser
messageParser, MessageId.Factory messageIdFactory,
+ MailboxPathLocker locker, MessageParserImpl
messageParser, MessageId.Factory messageIdFactory,
EventBus eventBus,
StoreMailboxAnnotationManager
annotationManager,
StoreRightManager storeRightManager,
diff --git
a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java
b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java
index 35dd6b1a60..2de53ef6e0 100644
---
a/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java
+++
b/mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMessageManager.java
@@ -37,7 +37,7 @@ import org.apache.james.mailbox.store.PreDeletionHooks;
import org.apache.james.mailbox.store.StoreMessageManager;
import org.apache.james.mailbox.store.StoreRightManager;
import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
public class InMemoryMessageManager extends StoreMessageManager {
@@ -48,7 +48,7 @@ public class InMemoryMessageManager extends
StoreMessageManager {
Mailbox mailbox,
QuotaManager quotaManager,
QuotaRootResolver quotaRootResolver,
- MessageParser messageParser,
+ MessageParserImpl messageParser,
MessageId.Factory messageIdFactory,
BatchSizes batchSizes,
StoreRightManager storeRightManager,
diff --git
a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
index 0ea7f7be4c..a08a4de5ac 100644
---
a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
+++
b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
@@ -31,7 +31,7 @@ import
org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.store.AbstractMailboxManagerAttachmentTest;
import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
import org.apache.james.mailbox.store.mail.AttachmentMapperFactory;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.junit.jupiter.api.BeforeEach;
class InMemoryMailboxManagerAttachmentTest extends
AbstractMailboxManagerAttachmentTest {
@@ -40,7 +40,7 @@ class InMemoryMailboxManagerAttachmentTest extends
AbstractMailboxManagerAttachm
@BeforeEach
void setup() throws Exception {
- MessageParser failingMessageParser = mock(MessageParser.class);
+ MessageParserImpl failingMessageParser = mock(MessageParserImpl.class);
when(failingMessageParser.retrieveAttachments(any(InputStream.class)))
.thenThrow(new RuntimeException("Message parser set to fail"));
diff --git
a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
index 035ac0d799..1c69f8705e 100644
--- a/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
+++ b/mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
@@ -45,7 +45,7 @@
<!--
Attachments
-->
- <bean id="messageParser"
class="org.apache.james.mailbox.store.mail.model.impl.MessageParser"/>
+ <bean id="messageParser"
class="org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl"/>
<bean id="storeMailboxAnnotationManager"
class="org.apache.james.mailbox.store.StoreMailboxAnnotationManager">
<constructor-arg index="0" ref="messageMapperFactory" />
diff --git
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageStorer.java
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageStorer.java
index d516cee44b..488d3f663a 100644
---
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageStorer.java
+++
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageStorer.java
@@ -42,7 +42,7 @@ import
org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm;
import org.apache.james.mailbox.store.mail.model.MailboxMessage;
import org.apache.james.mailbox.store.mail.model.MimeMessageId;
import org.apache.james.mailbox.store.mail.model.Subject;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder;
import org.apache.james.mailbox.store.mail.utils.MimeMessageHeadersUtil;
import org.apache.james.mime4j.dom.Message;
@@ -78,13 +78,13 @@ public interface MessageStorer {
private final MessageId.Factory messageIdFactory;
private final MessageFactory messageFactory;
private final AttachmentMapperFactory attachmentMapperFactory;
- private final MessageParser messageParser;
+ private final MessageParserImpl messageParser;
private final ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm;
private final Clock clock;
public WithAttachment(MailboxSessionMapperFactory mapperFactory,
MessageId.Factory messageIdFactory,
MessageFactory messageFactory,
AttachmentMapperFactory attachmentMapperFactory,
- MessageParser messageParser,
ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm, Clock clock) {
+ MessageParserImpl messageParser,
ThreadIdGuessingAlgorithm threadIdGuessingAlgorithm, Clock clock) {
this.mapperFactory = mapperFactory;
this.messageIdFactory = messageIdFactory;
this.messageFactory = messageFactory;
@@ -126,22 +126,22 @@ public interface MessageStorer {
parsingResults ->
Mono.fromRunnable(parsingResults::dispose).subscribeOn(Schedulers.boundedElastic()));
}
- private MessageParser.ParsingResult extractAttachments(Content
contentIn, Optional<Message> maybeMessage) {
+ private MessageParserImpl.ParsingResult extractAttachments(Content
contentIn, Optional<Message> maybeMessage) {
return maybeMessage.map(message -> {
try {
- return new
MessageParser.ParsingResult(messageParser.retrieveAttachments(message), () -> {
+ return new
MessageParserImpl.ParsingResult(messageParser.retrieveAttachments(message), ()
-> {
});
} catch (Exception e) {
LOGGER.warn("Error while parsing mail's attachments: {}",
e.getMessage(), e);
- return MessageParser.ParsingResult.EMPTY;
+ return MessageParserImpl.ParsingResult.EMPTY;
}
}).orElseGet(() -> {
try (InputStream inputStream = contentIn.getInputStream()) {
return messageParser.retrieveAttachments(inputStream);
} catch (Exception e) {
LOGGER.warn("Error while parsing mail's attachments: {}",
e.getMessage(), e);
- return MessageParser.ParsingResult.EMPTY;
+ return MessageParserImpl.ParsingResult.EMPTY;
}
});
}
diff --git
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
index 4eda433a06..2d0464cb15 100644
---
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
+++
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
@@ -81,7 +81,7 @@ import org.apache.james.mailbox.store.event.EventFactory;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.MessageMapper;
import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
import org.apache.james.mailbox.store.user.SubscriptionMapper;
@@ -124,7 +124,7 @@ public class StoreMailboxManager implements MailboxManager {
private final MailboxSessionMapperFactory mailboxSessionMapperFactory;
private final MailboxAnnotationManager annotationManager;
private final MailboxPathLocker locker;
- private final MessageParser messageParser;
+ private final MessageParserImpl messageParser;
private final Factory messageIdFactory;
private final SessionProvider sessionProvider;
private final QuotaManager quotaManager;
@@ -138,7 +138,7 @@ public class StoreMailboxManager implements MailboxManager {
@Inject
public StoreMailboxManager(MailboxSessionMapperFactory
mailboxSessionMapperFactory, SessionProvider sessionProvider,
- MailboxPathLocker locker, MessageParser
messageParser,
+ MailboxPathLocker locker, MessageParserImpl
messageParser,
Factory messageIdFactory,
MailboxAnnotationManager annotationManager,
EventBus eventBus, StoreRightManager
storeRightManager,
QuotaComponents quotaComponents,
MessageSearchIndex searchIndex, MailboxManagerConfiguration configuration,
@@ -223,7 +223,7 @@ public class StoreMailboxManager implements MailboxManager {
return storeRightManager;
}
- protected MessageParser getMessageParser() {
+ protected MessageParserImpl getMessageParser() {
return messageParser;
}
diff --git
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParser.java
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserImpl.java
similarity index 99%
rename from
mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParser.java
rename to
mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserImpl.java
index e3c6db833a..58bf11d69f 100644
---
a/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParser.java
+++
b/mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserImpl.java
@@ -53,7 +53,7 @@ import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.io.ByteSource;
-public class MessageParser {
+public class MessageParserImpl {
public static class ParsingResult {
public static final ParsingResult EMPTY = new
ParsingResult(ImmutableList.of(), () -> {
@@ -91,11 +91,11 @@ public class MessageParser {
.addAll(ATTACHMENT_CONTENT_TYPES)
.add(TEXT_CALENDAR)
.build();
- private static final Logger LOGGER =
LoggerFactory.getLogger(MessageParser.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(MessageParserImpl.class);
private final Cid.CidParser cidParser;
- public MessageParser() {
+ public MessageParserImpl() {
cidParser = Cid.parser()
.relaxed()
.unwrap();
diff --git
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
index a9fff1961c..212eb28afc 100644
---
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
+++
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
@@ -55,7 +55,7 @@ import org.apache.james.mailbox.model.search.PrefixedRegex;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.quota.QuotaComponents;
import org.apache.james.mailbox.store.search.MessageSearchIndex;
import org.apache.james.mailbox.store.search.SimpleMessageSearchIndex;
@@ -111,7 +111,7 @@ class StoreMailboxManagerTest {
MessageSearchIndex index = new
SimpleMessageSearchIndex(mockedMapperFactory, mockedMapperFactory, new
DefaultTextExtractor(), attachmentContentLoader);
storeMailboxManager = new StoreMailboxManager(mockedMapperFactory,
sessionProvider,
- new JVMMailboxPathLocker(), new MessageParser(),
messageIdFactory,
+ new JVMMailboxPathLocker(), new MessageParserImpl(),
messageIdFactory,
annotationManager, eventBus, storeRightManager,
quotaComponents, index, MailboxManagerConfiguration.DEFAULT,
PreDeletionHooks.NO_PRE_DELETION_HOOK,
threadIdGuessingAlgorithm, new UpdatableTickingClock(Instant.now()));
}
diff --git
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserImplTest.java
similarity index 70%
rename from
mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
rename to
mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserImplTest.java
index 9475f796f3..977f2cc79d 100644
---
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserTest.java
+++
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserImplTest.java
@@ -40,38 +40,38 @@ import org.apache.james.mime4j.message.DefaultMessageWriter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-class MessageParserTest {
- MessageParser testee;
+class MessageParserImplTest {
+ MessageParserImpl testee;
@BeforeEach
void setup() {
- testee = new MessageParser();
+ testee = new MessageParserImpl();
}
@Test
void getAttachmentsShouldBeEmptyWhenNoAttachment() throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/noAttachment.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/noAttachment.eml"));
assertThat(attachments.getAttachments()).isEmpty();
}
@Test
void getAttachmentsShouldIgnoreInlineWhenMixedMultipart() throws Exception
{
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/inlined-mixed.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/inlined-mixed.eml"));
assertThat(attachments.getAttachments()).hasSize(2);
}
@Test
void getAttachmentsShouldRetrieveAttachmentsWhenOneAttachment() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveAttachmentNameWhenOne() throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
Optional<String> expectedName = Optional.of("exploits_of_a_mom.png");
@@ -80,14 +80,14 @@ class MessageParserTest {
@Test
void
getAttachmentsShouldRetrieveAttachmentNameWhenOneContainingNonASCIICharacters()
throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/messageWithNonASCIIFilenameAttachment.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/messageWithNonASCIIFilenameAttachment.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
assertThat(attachments.getAttachments().get(0).getName()).contains("ديناصور.odt");
}
@Test
void getAttachmentsShouldRetrieveEmptyNameWhenNone() throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithoutName.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithoutName.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
assertThat(attachments.getAttachments().get(0).getName()).isEqualTo(Optional.empty());
@@ -95,7 +95,7 @@ class MessageParserTest {
@Test
void getAttachmentsShouldNotFailWhenContentTypeIsNotHere() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithoutContentType.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithoutContentType.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
assertThat(attachments.getAttachments().get(0).getContentType())
@@ -104,7 +104,7 @@ class MessageParserTest {
@Test
void getAttachmentsShouldNotFailWhenContentTypeIsEmpty() throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithEmptyContentType.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithEmptyContentType.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
assertThat(attachments.getAttachments().get(0).getContentType())
@@ -113,7 +113,7 @@ class MessageParserTest {
@Test
void
getAttachmentsShouldRetrieveTheAttachmentContentTypeWhenOneAttachment() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
assertThat(attachments.getAttachments().get(0).getContentType())
@@ -122,21 +122,21 @@ class MessageParserTest {
@Test
void retrieveAttachmentsShouldNotFailOnMessagesWithManyHeaders() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/mailWithManyHeaders.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/mailWithManyHeaders.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
}
@Test
void retrieveAttachmentsShouldNotFailOnMessagesWithLongHeaders() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/mailWithLongHeaders.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/mailWithLongHeaders.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
}
@Test
void
getAttachmentsShouldRetrieveTheAttachmentContentTypeWhenOneAttachmentWithSimpleContentType()
throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithSimpleContentType.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentWithSimpleContentType.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
assertThat(attachments.getAttachments().get(0).getContentType())
@@ -145,7 +145,7 @@ class MessageParserTest {
@Test
void getAttachmentsShouldReturnTheExpectedAttachment() throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneAttachmentAndSomeTextInlined.eml"));
ParsedAttachment attachment = attachments.getAttachments().get(0);
assertThat(attachment.getContent().openStream())
@@ -154,14 +154,14 @@ class MessageParserTest {
@Test
void getAttachmentsShouldRetrieveAttachmentsWhenTwo() throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/twoAttachments.eml"));
assertThat(attachments.getAttachments()).hasSize(2);
}
@Test
void retrieveAttachmentShouldUseFilenameAsNameWhenNoName() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/filenameOnly.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/filenameOnly.eml"));
assertThat(attachments.getAttachments()).hasSize(1)
.extracting(ParsedAttachment::getName)
@@ -172,7 +172,7 @@ class MessageParserTest {
@Test
void retrieveAttachmentShouldUseNameWhenBothNameAndFilename() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/filenameAndName.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/filenameAndName.eml"));
assertThat(attachments.getAttachments()).hasSize(1)
.extracting(ParsedAttachment::getName)
@@ -183,21 +183,21 @@ class MessageParserTest {
@Test
void getAttachmentsShouldRetrieveEmbeddedAttachmentsWhenSome() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/embeddedAttachmentWithInline.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/embeddedAttachmentWithInline.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveInlineAttachmentsWhenSome() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/embeddedAttachmentWithAttachment.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/embeddedAttachmentWithAttachment.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveTheAttachmentCIDWhenOne() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachment.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachment.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
assertThat(attachments.getAttachments().get(0).getCid()).isEqualTo(Optional.of(Cid.from("part1.37a15c92.a7c34...@linagora.com")));
@@ -205,7 +205,7 @@ class MessageParserTest {
@Test
void getAttachmentsShouldSetInlineWhenOneInlinedAttachment() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachment.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachment.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
assertThat(attachments.getAttachments().get(0).isInline()).isTrue();
@@ -213,63 +213,63 @@ class MessageParserTest {
@Test
void getAttachementsShouldRetrieveHtmlAttachementsWhenSome() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneHtmlAttachmentAndSomeTextInlined.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneHtmlAttachmentAndSomeTextInlined.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
}
@Test
void
getAttachementsShouldRetrieveAttachmentsWhenSomeAreInTheMultipartAlternative()
throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/invitationEmailFromOP.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/invitationEmailFromOP.eml"));
assertThat(attachments.getAttachments()).hasSize(6);
}
@Test
void
getAttachmentsShouldNotConsiderUnknownContentDispositionAsAttachments() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/unknownDisposition.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/unknownDisposition.eml"));
assertThat(attachments.getAttachments()).hasSize(0);
}
@Test
void
getAttachmentsShouldConsiderNoContentDispositionAsAttachmentsWhenCID() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/noContentDispositionWithCID.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/noContentDispositionWithCID.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveAttachmentsWhenNoCidForInlined() throws
Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithNoCid.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithNoCid.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveAttachmentsWhenEmptyCidForInlined()
throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithEmptyCid.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithEmptyCid.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
}
@Test
void getAttachmentsShouldRetrieveAttachmentsWhenBlankCidForInlined()
throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithBlankCid.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/oneInlinedAttachmentWithBlankCid.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
}
@Test
void
getAttachmentsShouldRetrieveAttachmentsWhenOneFailOnWrongContentDisposition()
throws Exception {
- MessageParser.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/multiAttachmentsWithOneWrongContentDisposition.eml"));
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(ClassLoader.getSystemResourceAsStream("eml/multiAttachmentsWithOneWrongContentDisposition.eml"));
assertThat(attachments.getAttachments()).hasSize(2);
}
@Test
void
getAttachmentsShouldRetrieveOneAttachmentWhenMessageWithAttachmentContentDisposition()
throws Exception {
- MessageParser.ParsingResult attachments = testee.retrieveAttachments(
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(
ClassLoader.getSystemResourceAsStream("eml/emailWithOnlyAttachment.eml"));
assertThat(attachments.getAttachments()).hasSize(1);
@@ -277,7 +277,7 @@ class MessageParserTest {
@Test
void getAttachmentsShouldRetrieveCharset() throws Exception {
- MessageParser.ParsingResult attachments = testee.retrieveAttachments(
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(
ClassLoader.getSystemResourceAsStream("eml/charset.eml"));
assertThat(attachments.getAttachments()).hasSize(1)
@@ -288,7 +288,7 @@ class MessageParserTest {
@Test
void getAttachmentsShouldRetrieveAllPartsCharset() throws Exception {
- MessageParser.ParsingResult attachments = testee.retrieveAttachments(
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(
ClassLoader.getSystemResourceAsStream("eml/charset2.eml"));
assertThat(attachments.getAttachments()).hasSize(2)
@@ -299,7 +299,7 @@ class MessageParserTest {
@Test
void getAttachmentsShouldNotConsiderTextCalendarAsAttachmentsByDefault()
throws Exception {
- MessageParser.ParsingResult attachments = testee.retrieveAttachments(
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(
ClassLoader.getSystemResourceAsStream("eml/calendar.eml"));
assertThat(attachments.getAttachments())
@@ -308,7 +308,7 @@ class MessageParserTest {
@Test
void getAttachmentsShouldConsiderTextCalendarAsAttachments() throws
Exception {
- MessageParser.ParsingResult attachments = testee.retrieveAttachments(
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(
ClassLoader.getSystemResourceAsStream("eml/calendar2.eml"));
assertThat(attachments.getAttachments())
@@ -319,7 +319,7 @@ class MessageParserTest {
@Test
void gpgSignatureShouldBeConsideredAsAnAttachment() throws Exception {
- MessageParser.ParsingResult attachments = testee.retrieveAttachments(
+ MessageParserImpl.ParsingResult attachments =
testee.retrieveAttachments(
ClassLoader.getSystemResourceAsStream("eml/signedMessage.eml"));
assertThat(attachments.getAttachments()).hasSize(2)
diff --git
a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
index 7f766fc2b0..bef5c76e07 100644
---
a/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
+++
b/mpt/impl/imap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
@@ -55,7 +55,7 @@ import
org.apache.james.mailbox.store.StoreSubscriptionManager;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm;
import org.apache.james.mailbox.store.mail.ThreadIdGuessingAlgorithm;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver;
import org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater;
import org.apache.james.mailbox.store.quota.QuotaComponents;
@@ -122,7 +122,7 @@ public class CassandraHostSystem extends
JamesImapHostSystem {
MessageSearchIndex index = new SimpleMessageSearchIndex(mapperFactory,
mapperFactory, new DefaultTextExtractor(), attachmentManager);
mailboxManager = new CassandraMailboxManager(mapperFactory,
sessionProvider,
- new JVMMailboxPathLocker(), new MessageParser(), messageIdFactory,
+ new JVMMailboxPathLocker(), new MessageParserImpl(),
messageIdFactory,
eventBus, annotationManager, storeRightManager, quotaComponents,
index, MailboxManagerConfiguration.DEFAULT,
PreDeletionHooks.NO_PRE_DELETION_HOOK, threadIdGuessingAlgorithm,
clock);
diff --git
a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
index 5f823df9b5..b10f5cca64 100644
---
a/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
+++
b/mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
@@ -56,7 +56,7 @@ import
org.apache.james.mailbox.store.event.MailboxAnnotationListener;
import org.apache.james.mailbox.store.extractor.DefaultTextExtractor;
import org.apache.james.mailbox.store.mail.NaiveThreadIdGuessingAlgorithm;
import org.apache.james.mailbox.store.mail.model.DefaultMessageId;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
import org.apache.james.mailbox.store.quota.DefaultUserQuotaRootResolver;
import org.apache.james.mailbox.store.quota.ListeningCurrentQuotaUpdater;
import org.apache.james.mailbox.store.quota.QuotaComponents;
@@ -107,7 +107,7 @@ public class JPAHostSystem extends JamesImapHostSystem {
JPAMailboxSessionMapperFactory mapperFactory = new
JPAMailboxSessionMapperFactory(entityManagerFactory, uidProvider,
modSeqProvider, jpaConfiguration);
MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
- MessageParser messageParser = new MessageParser();
+ MessageParserImpl messageParser = new MessageParserImpl();
InVMEventBus eventBus = new InVMEventBus(new InVmEventDelivery(new
RecordingMetricFactory()), EventBusTestFixture.RETRY_BACKOFF_CONFIGURATION, new
MemoryEventDeadLetters());
diff --git
a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
index 76949b9a27..d214765110 100644
---
a/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
+++
b/server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
@@ -123,7 +123,7 @@
Mailbox
===========================================================================
-->
- <bean id="messageParser"
class="org.apache.james.mailbox.store.mail.model.impl.MessageParser"
init-method="init"/>
+ <bean id="messageParser"
class="org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl"
init-method="init"/>
<!-- Mailbox Managers -->
<bean
class="org.apache.james.container.spring.bean.factorypostprocessor.MailboxConfigurationBeanFactoryPostProcessor"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org
