This is an automated email from the ASF dual-hosted git repository. btellier pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git.
from 2179ab3 Merge remote-tracking branch 'mine/jdk-11' new 2844512 JAMES-2997 Move james-server-utils InputStream in a dedicated io package new b81e1fe JAMES-2997 Provide an efficient 'size' input stream new 75e04cd JAMES-2997 step #1 Rely on AttachmentContentLoader within scanning search new 8f286b5 JAMES-2997 step #2 Remove Attachment::toBlob method new a8e33ba JAMES-2997 step #3 Rely on AttachmentContent loader for JMAP-draft message creation new 0d0607d JAMES-2997 step #4 Implement AttachmentMapper::loadAttachmentContent new e3c4567 JAMES-2997 step #5 Implement AttachmentMapper::storeAttachmentForOwner new af96d34 JAMES-2997 step #6 Remove AttachmentManager::storeAttachmentsForMessage unused method new 93b7d28 JAMES-2997 step #7 Do not rely on properties to determine if a message has attachment new 431a8e1 JAMES-2997 step #8 Stop relying on Attachment byte array in AttachmentMapper::storeAttachmentsForMessage new 6a75ba7 JAMES-2997 step #9 CassandraAttachmentDAO should not rely on bytes field new 935e1f5 JAMES-2997 step #10 Mailbox backend is responsible of creating messageAttachments new 06d3b79 JAMES-2997 step #11 Remove bytes from attachment new 0f4142e JAMES-2997 step #12 Attachment builder should require attachmentId new c75ecc3 JAMES-2997 step #13 StoreMessageIdManager should rely on StoreRightManager new 3d46590 JAMES-2997 Renable StoreBlobManagerTest new 2fc93a7 JAMES-2997 Renable AttachmentTest new 5ed32bf JAMES-2997 Renable BlobTest new aad93eb JAMES-2997 Renable AttachmentMapperTest new 09c2ebb JAMES-2997 Renable BlobTest AbstractMailboxManagerAttachmentTest new 45ef5e4 JAMES-2997 Renable SetMessagesCreationProcessorTest new 7f7da1e JAMES-2997 Renable MIMEMessageConverterTest new 18530db JAMES-2997 Renable MessageParserTest new acf750d JAMES-2997 Renable and relocate search tests new f6d9341 JAMES-2997 Renable SetMessagesMethodTest new 98e3719 [REFACTORING] Favor composition over inheritance in order to instantiate messages new f407fba [REFACTORING] Favor composition over inheritance in order to parse and store attachments new d260409 JAMES-2997 step #8 Stop relying on Attachment byte array in AttachmentMapper::storeAttachmentsForMessage new e72c2cd JAMES-2997 step #14 Abstract message storage new 7cdf09d JAMES-2997 JPA and maildir should generate fix AttachmentId new a5ea96d JAMES-2990 s/SizeInputStream/CurrentPositionInputStream/ new ee9c1b5 JAMES-2997 Fix checkstyle in AttachmentMapper new 23725df JAMES-2997 Store attachments sequentially with Cassandra new 4bc79a9 JAMES-2997 ReactorUtils::toChunk should be done on an elastic scheduler new be52477 JAMES-2997 step #10 Mailbox backend is responsible of creating messageAttachments new c6f8e0a JAMES-2997 s/Attachment/AttachmentMetadata + s/MessageAttachment/MessageAttachmentMetadata new 8f0c332 JAMES-3151 HasMimeType matchers fails on empty charset The 37 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../listeners/SetCustomFlagOnBigMessagesTest.java | 12 +- mailbox/api/pom.xml | 1 - .../james/mailbox/AttachmentContentLoader.java | 11 +- .../apache/james/mailbox/AttachmentManager.java | 22 +- .../org/apache/james/mailbox/MessageManager.java | 43 ++- .../mailbox/exception/BlobNotFoundException.java | 5 + .../{Attachment.java => AttachmentMetadata.java} | 80 +--- .../java/org/apache/james/mailbox/model/Blob.java | 38 +- ...achment.java => MessageAttachmentMetadata.java} | 31 +- .../apache/james/mailbox/model/MessageResult.java | 2 +- .../james/mailbox/model/ParsedAttachment.java | 136 +++++++ .../mailbox/MailboxManagerStressContract.java | 2 +- .../apache/james/mailbox/MailboxManagerTest.java | 52 +-- .../mailbox/manager/ManagerTestProvisionner.java | 4 +- .../{BlobTest.java => AttachmentMetadataTest.java} | 72 ++-- .../apache/james/mailbox/model/AttachmentTest.java | 155 -------- .../org/apache/james/mailbox/model/BlobTest.java | 13 +- ...est.java => MessageAttachmentMetadataTest.java} | 64 ++-- .../mailbox/cassandra/CassandraMessageManager.java | 29 +- .../mailbox/cassandra/mail/AttachmentLoader.java | 12 +- .../cassandra/mail/CassandraAttachmentDAOV2.java | 12 +- .../cassandra/mail/CassandraAttachmentMapper.java | 66 ++-- .../cassandra/mail/CassandraMessageDAO.java | 4 +- .../cassandra/mail/MessageRepresentation.java | 4 +- .../cassandra/CassandraMailboxManagerProvider.java | 4 +- .../cassandra/CassandraTestSystemFixture.java | 4 +- .../cassandra/mail/AttachmentLoaderTest.java | 42 +-- .../mail/CassandraAttachmentDAOV2Test.java | 7 +- .../mail/CassandraAttachmentMapperTest.java | 1 - .../CassandraMailboxManagerAttachmentTest.java | 5 +- .../cassandra/mail/CassandraMessageDAOTest.java | 8 +- .../MessageAttachmentRepresentationByIdTest.java | 6 +- .../elasticsearch/json/IndexableMessage.java | 13 +- .../ElasticSearchIntegrationTest.java | 16 +- ...asticSearchListeningMessageSearchIndexTest.java | 12 +- .../elasticsearch/json/IndexableMessageTest.java | 53 +-- .../search/ElasticSearchSearcherTest.java | 3 +- .../mailbox/jpa/JPAAttachmentContentLoader.java | 20 +- .../james/mailbox/jpa/JPAMailboxManager.java | 67 ---- .../james/mailbox/jpa/JPAMessageManager.java | 87 ----- .../model/openjpa/AbstractJPAMailboxMessage.java | 23 +- .../mailbox/jpa/openjpa/OpenJPAMailboxManager.java | 32 +- .../mailbox/jpa/openjpa/OpenJPAMessageFactory.java | 66 ++++ .../mailbox/jpa/openjpa/OpenJPAMessageManager.java | 59 +-- .../mailbox/jpa/JpaMailboxManagerProvider.java | 2 +- .../lucene/search/LuceneMessageSearchIndex.java | 5 +- .../mailbox/maildir/mail/model/MaildirMessage.java | 23 +- .../maildir/MaildirAttachmentContentLoader.java | 29 +- .../maildir/MaildirMailboxManagerProvider.java | 2 +- .../mailbox/inmemory/InMemoryMessageManager.java | 26 +- .../inmemory/mail/InMemoryAttachmentMapper.java | 75 +++- .../mail/InMemoryMailboxManagerAttachmentTest.java | 1 - .../inmemory/mail/MemoryAttachmentMapperTest.java | 1 - .../manager/InMemoryIntegrationResources.java | 74 ++-- .../james/vault/DeletedMessageConverterTest.java | 17 +- .../james/vault/DeletedMessageVaultHookTest.java | 3 +- .../store/search/SimpleMessageSearchIndexTest.java | 3 +- .../apache/james/mailbox/store/MessageFactory.java | 50 +++ .../james/mailbox/store/MessageResultImpl.java | 4 +- .../apache/james/mailbox/store/MessageStorer.java | 139 +++++++ .../mailbox/store/StoreAttachmentManager.java | 24 +- .../james/mailbox/store/StoreBlobManager.java | 32 +- .../james/mailbox/store/StoreMailboxManager.java | 4 +- .../james/mailbox/store/StoreMessageIdManager.java | 12 +- .../james/mailbox/store/StoreMessageManager.java | 94 +---- .../mailbox/store/StoreMessageResultIterator.java | 4 +- .../james/mailbox/store/mail/AttachmentMapper.java | 16 +- .../store/mail/model/DelegatingMailboxMessage.java | 4 +- .../james/mailbox/store/mail/model/Message.java | 4 +- .../store/mail/model/impl/MessageParser.java | 29 +- .../store/mail/model/impl/PropertyBuilder.java | 14 - .../mail/model/impl/SimpleMailboxMessage.java | 12 +- .../store/mail/model/impl/SimpleMessage.java | 8 +- .../mailbox/store/search/MessageSearches.java | 43 ++- .../store/search/SimpleMessageSearchIndex.java | 9 +- .../store/AbstractCombinationManagerTest.java | 62 ++-- .../AbstractMailboxManagerAttachmentTest.java | 20 +- .../store/AbstractMessageIdManagerStorageTest.java | 1 + .../apache/james/mailbox/store/MessageBuilder.java | 4 +- .../mailbox/store/StoreAttachmentManagerTest.java | 10 +- .../james/mailbox/store/StoreBlobManagerTest.java | 55 +-- .../mailbox/store/StoreMailboxManagerTest.java | 4 +- .../store/mail/model/AttachmentMapperTest.java | 295 ++++++--------- .../model/MessageWithAttachmentMapperTest.java | 69 ++-- .../store/mail/model/impl/MessageParserTest.java | 97 +++-- .../store/mail/model/impl/PropertyBuilderTest.java | 18 +- .../mail/model/impl/SimpleMailboxMessageTest.java | 12 +- .../search/AbstractMessageSearchIndexTest.java | 52 +-- .../SearchUtilsMultipartMixedTest.java | 12 +- .../store/{ => search}/SearchUtilsRFC822Test.java | 11 +- .../store/{ => search}/SearchUtilsTest.java | 13 +- .../tools/indexer/MessageIdReIndexerImplTest.java | 2 +- .../mailbox/tools/indexer/ReIndexerImplTest.java | 12 +- .../james/transport/matchers/HasMimeType.java | 32 +- .../james/transport/matchers/HasMimeTypeTest.java | 35 +- .../cassandra/host/CassandraHostSystem.java | 10 +- .../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 4 +- .../maildir/host/MaildirHostSystem.java | 2 +- .../james/imap/processor/AppendProcessor.java | 3 +- .../blob/cassandra/CassandraBlobStoreTest.java | 2 +- .../apache/james/blob/mail/MimeMessageStore.java | 2 +- .../core/MimeMessageInputStreamSourceTest.java | 2 +- .../modules/mailbox/CassandraMailboxModule.java | 2 + .../james/modules/mailbox/JPAMailboxModule.java | 3 + .../org/apache/james/modules/MailboxProbeImpl.java | 4 +- .../james/modules/mailbox/MemoryMailboxModule.java | 2 + .../apache/james/jmap/draft/MessageIdProbe.java | 4 +- .../james/util/{ => io}/BodyOffsetInputStream.java | 2 +- .../util/{ => io}/CountDownConsumeInputStream.java | 2 +- .../james/util/io/CurrentPositionInputStream.java | 83 +++-- .../james/util/io/InputStreamConsummer.java} | 17 +- .../james/util/{ => io}/InputStreamUtils.java | 2 +- .../james/util/{ => io}/ZeroedInputStream.java | 2 +- .../james/util/BodyOffsetInputStreamTest.java | 1 + .../apache/james/util/InputStreamUtilsTest.java | 1 + .../util/io/CurrentPositionInputStreamTest.java | 120 ++++++ .../MessageFastViewPrecomputedProperties.java | 4 +- .../mailets/delivery/MailboxAppender.java | 8 +- .../mailets/delivery/LocalDeliveryTest.java | 8 +- .../pom.xml | 5 + .../cassandra/CassandraSetMessagesMethodTest.java | 1 - .../jmap-draft-integration-testing-common/pom.xml | 5 + .../methods/integration/SetMessagesMethodTest.java | 401 ++++++++++----------- .../integration/cucumber/DownloadStepdefs.java | 2 +- .../integration/cucumber/UploadStepdefs.java | 4 +- .../memory-jmap-draft-integration-testing/pom.xml | 5 + .../jmap/memory/MemorySetMessagesMethodTest.java | 2 - .../pom.xml | 5 + .../RabbitMQAwsS3SetMessagesMethodTest.java | 1 - .../jmap/draft/methods/MIMEMessageConverter.java | 83 +++-- .../james/jmap/draft/methods/MessageAppender.java | 52 ++- .../james/jmap/draft/methods/SendMDNProcessor.java | 24 +- .../org/apache/james/jmap/draft/model/JmapMDN.java | 3 +- .../model/message/view/MessageFullViewFactory.java | 16 +- .../org/apache/james/jmap/http/DownloadRoutes.java | 3 +- .../org/apache/james/jmap/http/UploadRoutes.java | 36 +- .../MessageFastViewProjectionItemFactoryTest.java | 2 +- .../jmap/draft/methods/GetMessagesMethodTest.java | 52 +-- .../draft/methods/MIMEMessageConverterTest.java | 255 +++++++------ .../methods/SetMessagesCreationProcessorTest.java | 12 +- .../methods/SetMessagesUpdateProcessorTest.java | 4 +- .../message/view/MessageFastViewFactoryTest.java | 8 +- .../message/view/MessageFullViewFactoryTest.java | 11 +- .../message/view/MessageHeaderViewFactoryTest.java | 2 +- .../view/MessageMetadataViewFactoryTest.java | 2 +- .../jmap/draft/send/PostDequeueDecoratorTest.java | 16 +- ...mputeMessageFastViewProjectionListenerTest.java | 12 +- ...llFastViewProjectionItemsRequestToTaskTest.java | 4 +- ...erFastViewProjectionItemsRequestToTaskTest.java | 4 +- .../webadmin/vault/routes/RestoreService.java | 2 +- .../james/webadmin/routes/MailboxesRoutesTest.java | 16 +- .../james/webadmin/routes/MessageRoutesTest.java | 4 +- .../webadmin/routes/UserMailboxesRoutesTest.java | 4 +- .../james/webadmin/service/ExportServiceTest.java | 3 +- .../service/MailboxesExportRequestToTaskTest.java | 4 +- 155 files changed, 2272 insertions(+), 2060 deletions(-) copy server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/PayloadCodec.java => mailbox/api/src/main/java/org/apache/james/mailbox/AttachmentContentLoader.java (78%) rename mailbox/api/src/main/java/org/apache/james/mailbox/model/{Attachment.java => AttachmentMetadata.java} (62%) rename mailbox/api/src/main/java/org/apache/james/mailbox/model/{MessageAttachment.java => MessageAttachmentMetadata.java} (79%) create mode 100644 mailbox/api/src/main/java/org/apache/james/mailbox/model/ParsedAttachment.java copy mailbox/api/src/test/java/org/apache/james/mailbox/model/{BlobTest.java => AttachmentMetadataTest.java} (54%) delete mode 100644 mailbox/api/src/test/java/org/apache/james/mailbox/model/AttachmentTest.java rename mailbox/api/src/test/java/org/apache/james/mailbox/model/{MessageAttachmentTest.java => MessageAttachmentMetadataTest.java} (63%) copy server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/GetVacationRequestTest.java => mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAAttachmentContentLoader.java (70%) delete mode 100644 mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxManager.java delete mode 100644 mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMessageManager.java create mode 100644 mailbox/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageFactory.java copy server/protocols/jmap-draft/src/main/java/org/apache/james/jmap/draft/exceptions/JmapFieldNotSupportedException.java => mailbox/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirAttachmentContentLoader.java (70%) create mode 100644 mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageFactory.java create mode 100644 mailbox/store/src/main/java/org/apache/james/mailbox/store/MessageStorer.java rename mailbox/store/src/test/java/org/apache/james/mailbox/store/{ => search}/SearchUtilsMultipartMixedTest.java (97%) rename mailbox/store/src/test/java/org/apache/james/mailbox/store/{ => search}/SearchUtilsRFC822Test.java (93%) rename mailbox/store/src/test/java/org/apache/james/mailbox/store/{ => search}/SearchUtilsTest.java (99%) rename server/container/util/src/main/java/org/apache/james/util/{ => io}/BodyOffsetInputStream.java (99%) rename server/container/util/src/main/java/org/apache/james/util/{ => io}/CountDownConsumeInputStream.java (98%) copy protocols/pop3/src/main/java/org/apache/james/protocols/pop3/core/ExtraDotInputStream.java => server/container/util/src/main/java/org/apache/james/util/io/CurrentPositionInputStream.java (55%) copy server/{blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/PayloadCodec.java => container/util/src/main/java/org/apache/james/util/io/InputStreamConsummer.java} (80%) rename server/container/util/src/main/java/org/apache/james/util/{ => io}/InputStreamUtils.java (97%) rename server/container/util/src/main/java/org/apache/james/util/{ => io}/ZeroedInputStream.java (97%) create mode 100644 server/container/util/src/test/java/org/apache/james/util/io/CurrentPositionInputStreamTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org