Upgrade James SHA1 (#1491)

linagora · Jan 28, 2025 · 1d68dbb · 1d68dbb
1 parent a6233c7
commit 1d68dbb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/james-project b/james-project
diff --git a/...ackend/apps/distributed/src/main/java/com/linagora/tmail/james/app/DistributedServer.java b/...ackend/apps/distributed/src/main/java/com/linagora/tmail/james/app/DistributedServer.java
@@ -40,6 +40,7 @@
 import org.apache.james.eventsourcing.eventstore.EventNestedTypes;
 import org.apache.james.jmap.InjectionKeys;
 import org.apache.james.jmap.JMAPListenerModule;
+import org.apache.james.jmap.JMAPModule;
 import org.apache.james.json.DTO;
 import org.apache.james.json.DTOModule;
 import org.apache.james.mailbox.MailboxManager;
@@ -269,6 +270,7 @@ protected void configure() {
         new ForwardGetMethodModule(),
         new ForwardSetMethodModule(),
         new JMAPServerModule(),
+        JMAPModule.INSTANCE,
         new JmapEventBusModule(),
         new PublicAssetsModule(),
         new KeystoreCassandraModule(),

diff --git a/...box/encrypted/api/src/test/scala/com/linagora/tmail/encrypted/ClearEmailContentTest.scala b/...box/encrypted/api/src/test/scala/com/linagora/tmail/encrypted/ClearEmailContentTest.scala
@@ -24,7 +24,7 @@ import java.util.stream.IntStream
 import com.google.common.io.ByteSource
 import org.apache.james.jmap.api.model.Preview
 import org.apache.james.jmap.utils.JsoupHtmlTextExtractor
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl
 import org.apache.james.mime4j.dom.{Message, Multipart}
 import org.apache.james.mime4j.message.{BasicBodyFactory, BodyPartBuilder, MultipartBuilder}
 import org.apache.james.util.html.HtmlTextExtractor
@@ -58,7 +58,7 @@ class ClearEmailContentTest {
     val messageContentExtractor: MessageContentExtractor = new MessageContentExtractor()
     val htmlTextExtractor: HtmlTextExtractor = new JsoupHtmlTextExtractor
     previewFactory = new Preview.Factory(new MessageContentExtractor, htmlTextExtractor)
-    clearEmailContentFactory = new ClearEmailContentFactory(new MessageParser(), messageContentExtractor, previewFactory)
+    clearEmailContentFactory = new ClearEmailContentFactory(new MessageParserImpl(), messageContentExtractor, previewFactory)
 
     textPart = BodyPartBuilder.create()
       .setBody(TEXT_CONTENT, "plain", StandardCharsets.UTF_8)

diff --git a/...emory/src/test/java/com/linagora/tmail/encrypted/InMemoryEncryptedMessageManagerTest.java b/...emory/src/test/java/com/linagora/tmail/encrypted/InMemoryEncryptedMessageManagerTest.java
@@ -44,7 +44,7 @@
 import org.apache.james.mailbox.model.MessageRange;
 import org.apache.james.mailbox.model.MessageResult;
 import org.apache.james.mailbox.model.MessageResultIterator;
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser;
+import org.apache.james.mailbox.store.mail.model.impl.MessageParserImpl;
 import org.apache.james.mime4j.dom.Body;
 import org.apache.james.mime4j.dom.Message;
 import org.apache.james.mime4j.dom.Multipart;
@@ -91,7 +91,7 @@ void setUp() throws Exception {
         blobStore = new DeDuplicationBlobStore(new MemoryBlobStoreDAO(), BucketName.DEFAULT, new PlainBlobId.Factory());
         emailContentStore = new InMemoryEncryptedEmailContentStore(blobStore);
         testee = new EncryptedMessageManager(messageManager, keystoreManager,
-            new ClearEmailContentFactory(new MessageParser(), messageContentExtractor, new Preview.Factory(messageContentExtractor, new JsoupHtmlTextExtractor())),
+            new ClearEmailContentFactory(new MessageParserImpl(), messageContentExtractor, new Preview.Factory(messageContentExtractor, new JsoupHtmlTextExtractor())),
             emailContentStore);
 
         message = Message.Builder
@@ -281,7 +281,7 @@ void commandAppendShouldNotEncryptWhenNameSpaceIsNotPrivate() throws Exception {
 
         MessageContentExtractor messageContentExtractor = new MessageContentExtractor();
         EncryptedMessageManager testee = new EncryptedMessageManager(messageManager, keystoreManager,
-            new ClearEmailContentFactory(new MessageParser(), messageContentExtractor, new Preview.Factory(messageContentExtractor, new JsoupHtmlTextExtractor())),
+            new ClearEmailContentFactory(new MessageParserImpl(), messageContentExtractor, new Preview.Factory(messageContentExtractor, new JsoupHtmlTextExtractor())),
             emailContentStore);
 
         testee.appendMessage(MessageManager.AppendCommand.from(message), session);
+1 −1		mailbox/api/src/main/java/org/apache/james/mailbox/model/ParsedAttachment.java
+2 −1		mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/CassandraMailboxSessionMapperFactory.java
+22 −4		mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraAttachmentMapper.java
+2 −2		mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraMailboxManagerProvider.java
+2 −2		mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/CassandraTestSystemFixture.java
+3 −3		.../cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
+2 −0		mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/utils/GuiceUtils.java
+2 −1		mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMailboxMessage.java
+2 −2		mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JpaMailboxManagerProvider.java
+2 −2		mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
+5 −5		mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/manager/InMemoryIntegrationResources.java
+1 −1		mailbox/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
+5 −247		mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParser.java
+278 −0		mailbox/store/src/main/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserImpl.java
+2 −2		mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxManagerTest.java
+3 −3		mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/impl/MessageParserImplTest.java
+2 −2		...ap-mailbox/cassandra/src/test/java/org/apache/james/mpt/imapmailbox/cassandra/host/CassandraHostSystem.java
+2 −2		mpt/impl/imap-mailbox/jpa/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
+2 −0		server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerMain.java
+2 −0		server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesServerMain.java
+2 −0		server/apps/distributed-pop3-app/src/main/java/org/apache/james/DistributedPOP3JamesServerMain.java
+2 −0		server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesServerMain.java
+5 −0		server/container/guice/cassandra/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
+3 −0		server/container/guice/mailbox-jpa/src/main/java/org/apache/james/modules/mailbox/JPAMailboxModule.java
+3 −0		server/container/guice/memory/src/main/java/org/apache/james/modules/mailbox/MemoryMailboxModule.java
+28 −5		server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java
+0 −37		server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPWithoutDraftCommonModule.java
+0 −11		server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/rfc8621/RFC8621MethodsModule.java
+0 −3		server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java
+1 −1		server/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
+16 −17		server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/DownloadRoutes.scala