You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2023/12/04 08:38:09 UTC
(james-project) 04/07: JAMES-2586 - Fixup PostgresMailboxMessageDAO
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch postgresql
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b8f3b368dbf475f0a0906264eb592878aa974249
Author: Tung Tran <vt...@linagora.com>
AuthorDate: Thu Nov 30 11:42:32 2023 +0700
JAMES-2586 - Fixup PostgresMailboxMessageDAO
---
.../apache/james/mailbox/postgres/mail/PostgresMessageModule.java | 1 -
.../mailbox/postgres/mail/dao/PostgresMailboxMessageDAOUtils.java | 7 ++++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageModule.java b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageModule.java
index 0321c34e32..6b92d9f204 100644
--- a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageModule.java
+++ b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageModule.java
@@ -28,7 +28,6 @@ import org.apache.james.backends.postgres.PostgresCommons.DataTypes;
import org.apache.james.backends.postgres.PostgresIndex;
import org.apache.james.backends.postgres.PostgresModule;
import org.apache.james.backends.postgres.PostgresTable;
-import org.apache.james.mailbox.postgres.mail.PostgresMailboxModule.PostgresMailboxTable;
import org.jooq.Field;
import org.jooq.Record;
import org.jooq.Table;
diff --git a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/dao/PostgresMailboxMessageDAOUtils.java b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/dao/PostgresMailboxMessageDAOUtils.java
index 1d832e20c5..f69021d3bb 100644
--- a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/dao/PostgresMailboxMessageDAOUtils.java
+++ b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/dao/PostgresMailboxMessageDAOUtils.java
@@ -21,7 +21,9 @@ package org.apache.james.mailbox.postgres.mail.dao;
import static org.apache.james.backends.postgres.PostgresCommons.LOCAL_DATE_TIME_DATE_FUNCTION;
import static org.apache.james.mailbox.postgres.mail.PostgresMessageModule.MessageTable.BODY_START_OCTET;
+import static org.apache.james.mailbox.postgres.mail.PostgresMessageModule.MessageTable.CONTENT_DESCRIPTION;
import static org.apache.james.mailbox.postgres.mail.PostgresMessageModule.MessageTable.CONTENT_DISPOSITION_PARAMETERS;
+import static org.apache.james.mailbox.postgres.mail.PostgresMessageModule.MessageTable.CONTENT_DISPOSITION_TYPE;
import static org.apache.james.mailbox.postgres.mail.PostgresMessageModule.MessageTable.CONTENT_ID;
import static org.apache.james.mailbox.postgres.mail.PostgresMessageModule.MessageTable.CONTENT_LANGUAGE;
import static org.apache.james.mailbox.postgres.mail.PostgresMessageModule.MessageTable.CONTENT_LOCATION;
@@ -101,7 +103,7 @@ interface PostgresMailboxMessageDAOUtils {
.orElse(ThreadId.fromBaseMessageId(PostgresMessageId.Factory.of(record.get(MESSAGE_ID))));
- Field<?>[] MESSAGE_METADATA_FIELDS_REQUIRE = new Field[] {
+ Field<?>[] MESSAGE_METADATA_FIELDS_REQUIRE = new Field[]{
MESSAGE_UID,
MOD_SEQ,
SIZE,
@@ -147,6 +149,8 @@ interface PostgresMailboxMessageDAOUtils {
.map(Long::valueOf)
.orElse(null));
+ property.setContentDescription(record.get(CONTENT_DESCRIPTION));
+ property.setContentDispositionType(record.get(CONTENT_DISPOSITION_TYPE));
property.setContentID(record.get(CONTENT_ID));
property.setContentMD5(record.get(CONTENT_MD5));
property.setContentTransferEncoding(record.get(CONTENT_TRANSFER_ENCODING));
@@ -173,6 +177,7 @@ interface PostgresMailboxMessageDAOUtils {
.messageId(PostgresMessageId.Factory.of(record.get(MESSAGE_ID)))
.mailboxId(PostgresMailboxId.of(record.get(MAILBOX_ID)))
.uid(MessageUid.of(record.get(MESSAGE_UID)))
+ .modseq(ModSeq.of(record.get(MOD_SEQ)))
.threadId(RECORD_TO_THREAD_ID_FUNCTION.apply(record))
.internalDate(LOCAL_DATE_TIME_DATE_FUNCTION.apply(record.get(PostgresMessageModule.MessageTable.INTERNAL_DATE, LocalDateTime.class)))
.saveDate(LOCAL_DATE_TIME_DATE_FUNCTION.apply(record.get(SAVE_DATE, LocalDateTime.class)))
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org