Upgrade James

tmail-backend/apps/distributed/pom.xml

@@ -678,6 +678,10 @@
                             </extraDirectories>
                         </configuration>
                     </plugin>
+                    <plugin>
+                        <groupId>net.alchim31.maven</groupId>
+                        <artifactId>scala-maven-plugin</artifactId>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

tmail-backend/apps/distributed/src/main/java/com/linagora/tmail/james/app/DistributedServer.java

@@ -323,7 +323,7 @@ protected void configure() {
         new CassandraConsistencyTaskSerializationModule(),
         Modules.override(new CassandraMailboxModule())
             .with(binder -> {
-                binder.bind(CassandraAttachmentMapper.AttachmentIdAssignationStrategy.class).to(TmailCleverAttachmentIdAssignationStrategy.class);
+                binder.bind(CassandraAttachmentMapper.AttachmentIdAssignationStrategy.class).to(TMailCleverAttachmentIdAssignationStrategy.class);
                 binder.bind(MessageParser.class).to(TMailCleverMessageParser.class);
             }),
         new MailboxModule(),
@@ -363,7 +363,7 @@ protected void configure() {
             new TeamMailboxModule(),
             new TMailMailboxSortOrderProviderModule(),
             new TmailEventModule(),
-            new TmailEventDeadLettersModule(),
+            new TMailEventDeadLettersModule(),
             new TMailIMAPModule());
 
     public static void main(String[] args) throws Exception {

tmail-backend/apps/distributed/src/main/java/com/linagora/tmail/james/app/TMailCleverAttachmentIdAssignationStrategy.java

@@ -0,0 +1,34 @@
+/********************************************************************
+ *  As a subpart of Twake Mail, this file is edited by Linagora.    *
+ *                                                                  *
+ *  https://twake-mail.com/                                         *
+ *  https://linagora.com                                            *
+ *                                                                  *
+ *  This file is subject to The Affero Gnu Public License           *
+ *  version 3.                                                      *
+ *                                                                  *
+ *  https://www.gnu.org/licenses/agpl-3.0.en.html                   *
+ *                                                                  *
+ *  This program is distributed in the hope that it will be         *
+ *  useful, but WITHOUT ANY WARRANTY; without even the implied      *
+ *  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR         *
+ *  PURPOSE. See the GNU Affero General Public License for          *
+ *  more details.                                                   *
+ ********************************************************************/
+package com.linagora.tmail.james.app;
+
+import org.apache.james.mailbox.cassandra.mail.CassandraAttachmentMapper;
+import org.apache.james.mailbox.model.AttachmentId;
+import org.apache.james.mailbox.model.MessageId;
+import org.apache.james.mailbox.model.ParsedAttachment;
+import org.apache.james.mailbox.model.StringBackedAttachmentId;
+
+public class TMailCleverAttachmentIdAssignationStrategy implements CassandraAttachmentMapper.AttachmentIdAssignationStrategy {
+    @Override
+    public AttachmentId assign(ParsedAttachment parsedAttachment, MessageId messageId) {
+        if (parsedAttachment instanceof TMailCleverParsedAttachment TMailCleverParsedAttachment) {
+            return StringBackedAttachmentId.from(TMailCleverParsedAttachment.translate(messageId));
+        }
+        return StringBackedAttachmentId.random();
+    }
+}

tmail-backend/apps/distributed/src/main/java/com/linagora/tmail/james/app/TMailCleverBlobResolverModule.java

@@ -1,3 +1,21 @@
+/********************************************************************
+ *  As a subpart of Twake Mail, this file is edited by Linagora.    *
+ *                                                                  *
+ *  https://twake-mail.com/                                         *
+ *  https://linagora.com                                            *
+ *                                                                  *
+ *  This file is subject to The Affero Gnu Public License           *
+ *  version 3.                                                      *
+ *                                                                  *
+ *  https://www.gnu.org/licenses/agpl-3.0.en.html                   *
+ *                                                                  *
+ *  This program is distributed in the hope that it will be         *
+ *  useful, but WITHOUT ANY WARRANTY; without even the implied      *
+ *  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR         *
+ *  PURPOSE. See the GNU Affero General Public License for          *
+ *  more details.                                                   *
+ ********************************************************************/
+
 package com.linagora.tmail.james.app;
 
 import org.apache.james.jmap.routes.BlobResolver;

tmail-backend/apps/distributed/src/main/java/com/linagora/tmail/james/app/TmailEventDeadLettersModule.java → tmail-backend/apps/distributed/src/main/java/com/linagora/tmail/james/app/TMailEventDeadLettersModule.java

@@ -33,7 +33,7 @@
 import com.google.inject.Singleton;
 import com.linagora.tmail.event.TmailEventSerializer;
 
-public class TmailEventDeadLettersModule extends AbstractModule {
+public class TMailEventDeadLettersModule extends AbstractModule {
 
     @Provides
     @Singleton

tmail-backend/apps/distributed/src/main/scala/com/linagora/tmail/james/app/TMailCleverBlobResolver.scala

@@ -3,11 +3,13 @@ package com.linagora.tmail.james.app
 import org.apache.james.jmap.mail.BlobId
 import org.apache.james.jmap.routes.{AttachmentBlobResolver, BlobResolutionResult, BlobResolver, MessagePartBlobResolver, NonApplicable}
 import org.apache.james.mailbox.MailboxSession
+import reactor.core.scala.publisher.SMono
 
 class TMailCleverBlobResolver(messagePartBlobResolver: MessagePartBlobResolver, attachmentBlobResolver: AttachmentBlobResolver) extends BlobResolver {
-  override def resolve(blobId: BlobId, mailboxSession: MailboxSession): BlobResolutionResult =
-    attachmentBlobResolver.resolve(blobId, mailboxSession) match {
+  override def resolve(blobId: BlobId, mailboxSession: MailboxSession): SMono[BlobResolutionResult] =
+    attachmentBlobResolver.resolve(blobId, mailboxSession)
+      .flatMap[BlobResolutionResult] {
       case NonApplicable => messagePartBlobResolver.resolve(blobId, mailboxSession)
-      case any => any
+      case any => SMono.just(any)
     }
 }

tmail-backend/apps/distributed/src/main/scala/com/linagora/tmail/james/app/TMailCleverMessageParser.scala

@@ -1,11 +1,29 @@
+/** ******************************************************************
+ * As a subpart of Twake Mail, this file is edited by Linagora.    *
+ * *
+ * https://twake-mail.com/                                         *
+ * https://linagora.com                                            *
+ * *
+ * This file is subject to The Affero Gnu Public License           *
+ * version 3.                                                      *
+ * *
+ * https://www.gnu.org/licenses/agpl-3.0.en.html                   *
+ * *
+ * This program is distributed in the hope that it will be         *
+ * useful, but WITHOUT ANY WARRANTY; without even the implied      *
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR         *
+ * PURPOSE. See the GNU Affero General Public License for          *
+ * more details.                                                   *
+ * ****************************************************************** */
+
 package com.linagora.tmail.james.app
 
 import com.google.common.io.ByteSource
 import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream
 import org.apache.james.jmap.mail.{BlobId, Disposition, EmailBodyPart}
 import org.apache.james.jmap.method.ZoneIdProvider
 import org.apache.james.mailbox.model.{Cid, MessageId, ParsedAttachment}
-import org.apache.james.mailbox.store.mail.model.impl.MessageParser
+import org.apache.james.mailbox.store.mail.model.impl.{FileBufferedBodyFactory, MessageParser}
 import org.apache.james.mime4j.codec.DecodeMonitor
 import org.apache.james.mime4j.dom.{Message, SingleBody}
 import org.apache.james.mime4j.message.{DefaultMessageBuilder, DefaultMessageWriter}