This is an automated email from the ASF dual-hosted git repository. btellier pushed a change to branch dtm-workqueue in repository https://gitbox.apache.org/repos/asf/james-project.git
omit ea55fca4d0 fixup! fixup! fixup! fixup! fixup! [ENHANCEMENT] Workqueue for the deleted message vault omit 93903ded0e fixup! fixup! fixup! fixup! [ENHANCEMENT] Workqueue for the deleted message vault omit f9a3eb5402 fixup! fixup! fixup! [ENHANCEMENT] Workqueue for the deleted message vault omit 2791137c91 fixup! fixup! [ENHANCEMENT] Workqueue for the deleted message vault omit 3ee3a6299f fixup! [ENHANCEMENT] Workqueue for the deleted message vault omit 7082160d7a [ENHANCEMENT] Workqueue for the deleted message vault add 8c7fe1ef73 [Fixup] Fix imap and smtp deployment test after mime4j upgrade to 0.8.11 add 14f28d2dc6 JAMES-3961 Switch to Java 21 add 454d82ea11 JAMES-3961 Upgrade maven-plugin-plugin in order to work with Java 21 add d496df7104 JAMES-3961 Enfoce Maven 3.8.1+ usage add b56204abb6 JAMES-3961 Upgrade mockito: 5.2.0 -> 5.10.0 add 7995f1dcaa JAMES-3961 Update xbean-asm9 to make JPA work with Java 21 add 99d1d0432d JAMES-3961 Fix LeakAware test suite add 7f2fca77ed JAMES-3961 Relax Java modules add 8dab7eb842 JAMES-3691 Exception message change with Java 21 add fdc9fbb9ec JAMES-3691 Update Cucumber to 7.15.0 add 7c471f0967 JAMES-3961 AssertJ bean introspection add 6ea766d82a JAMES-3961 Mockito can no longer Mock EnumSet add 021cc5df44 JAMES-3961 Java 21 error message change add 65acac3d2c JAMES-3961 Cucumber update for JMAP draft integration tests add f659e241ae JAMES-3961 Fix PushSubscriptionSetMethodContract for Java 21 add f0a7aeaf88 JAMES-3961 README: Java 11 -> 21 add e63283960f JAMES-3961 Adopt eclipse-temurin:21-jre-jammy as a base docker image add 0f5d30525d JAMES-3961 Target jdk 11 for JPA modules add 1afab21248 JAMES-3961 Cucumber tests should not fail the unstable test phase add 69a2c04144 [FIX] IMAP APPEND file leak add c41e9fde43 [ENHANCEMENT] JMAP: limit parallel read in case of fastView miss add 6243bf7d4e JAMES-3977 Test for backpressure add 0d576d8123 JAMES-2586 Fix EmailSetMethod.emailGetShouldReturnUncheckedMailAddressValueWhenDraftEmail test add fe67473bd2 JAMES-3534 Update IdentityGetContract - fix failing when running with Distributed test add f5e8bc24ee JAMES-2586 Create AttachmentIdFactory (#2133) add a482e80738 [FIX] S3BlobStoreDAO::readReactive is blocking on the driver thread add f038aa737d Bump org.apache.commons:commons-configuration2 from 2.9.0 to 2.10.1 (#2147) add 4e2bb0b57b [FIX] Avoid sending bounce when reprocessing (#2139) add 11646b05bb [UPDATE] more javax APIs migrated to jakarta (#2141) add 9fb9faf026 [FIX] Solve weave/rest-smtp-sink: Docker image manifest v2 schema 1 deprecation issue (#2152) add a32eb317f4 [ENHANCEMENT] Workqueue for the deleted message vault This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ea55fca4d0) \ N -- N -- N refs/heads/dtm-workqueue (a32eb317f4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: Jenkinsfile | 2 +- backends-common/cassandra/pom.xml | 8 +- .../components/CassandraQuotaCurrentValueDao.java | 2 +- .../components/CassandraQuotaLimitDao.java | 2 +- .../cassandra/init/CassandraTableManager.java | 2 +- .../cassandra/init/CassandraTypesProvider.java | 2 +- .../cassandra/init/ResilientClusterProvider.java | 8 +- .../init/SessionWithInitializedTablesFactory.java | 8 +- .../migration/CassandraMigrationService.java | 4 +- .../migration/CassandraSchemaTransitions.java | 2 +- .../cassandra/migration/MigrationTask.java | 2 +- .../cassandra/utils/CassandraAsyncExecutor.java | 2 +- .../cassandra/utils/CassandraHealthCheck.java | 2 +- .../versions/CassandraSchemaVersionDAO.java | 2 +- .../versions/CassandraSchemaVersionManager.java | 2 +- backends-common/jpa/pom.xml | 12 +- .../james/backends/jpa/EntityManagerUtils.java | 2 +- .../james/backends/jpa/TransactionRunner.java | 8 +- .../apache/james/backends/jpa/JpaTestCluster.java | 4 +- backends-common/opensearch/pom.xml | 4 +- .../james/backends/opensearch/ClientProvider.java | 7 +- .../backends/opensearch/IndexCreationFactory.java | 2 +- .../backends/opensearch/OpenSearchHealthCheck.java | 2 +- backends-common/pulsar/pom.xml | 4 +- .../james/backends/pulsar/PulsarClients.scala | 2 +- .../backends/pulsar/DockerPulsarExtension.java | 2 +- backends-common/rabbitmq/pom.xml | 8 +- .../rabbitmq/RabbitMQConnectionFactory.java | 3 +- .../backends/rabbitmq/RabbitMQHealthCheck.java | 2 +- .../rabbitmq/ReactorRabbitMQChannelPool.java | 2 +- .../backends/rabbitmq/SimpleConnectionPool.java | 4 +- .../rabbitmq/RabbitMQConnectionFactoryTest.java | 4 +- .../james/backends/redis/RedisHealthCheck.scala | 2 +- .../james/backends/redis/RedisExtension.java | 2 +- core/pom.xml | 4 + .../main/java/org/apache/james/core/Domain.java | 2 +- event-bus/api/pom.xml | 4 +- .../james/events/EventDeadLettersHealthCheck.java | 2 +- .../james/events/CassandraEventDeadLetters.java | 2 +- .../james/events/CassandraEventDeadLettersDAO.java | 2 +- .../events/CassandraEventDeadLettersGroupDAO.java | 2 +- .../james/events/EventBusReconnectionHandler.java | 2 +- .../james/events/KeyReconnectionHandler.java | 2 +- .../org/apache/james/events/RabbitMQEventBus.java | 4 +- ...itMQJmapEventBusDeadLetterQueueHealthCheck.java | 2 +- ...QMailboxEventBusDeadLetterQueueHealthCheck.java | 2 +- .../apache/james/events/RoutingKeyConverter.java | 2 +- .../java/org/apache/james/events/InVMEventBus.java | 2 +- .../james/events/delivery/InVmEventDelivery.java | 2 +- event-sourcing/event-sourcing-core/pom.xml | 4 +- .../james/eventsourcing/CommandDispatcher.scala | 2 +- .../org/apache/james/eventsourcing/EventBus.scala | 2 +- .../eventstore/cassandra/CassandraEventStore.scala | 2 +- .../eventstore/cassandra/EventStoreDao.scala | 2 +- .../eventstore/cassandra/JsonEventSerializer.scala | 2 +- .../james/examples/imap/PingCommandParser.java | 2 +- .../james/examples/imap/PingImapPackages.java | 2 +- .../apache/james/examples/imap/PingProcessor.java | 2 +- .../listeners/SetCustomFlagOnBigMessages.java | 3 +- .../apache/james/examples/GraphiteExporter.java | 2 +- .../apache/james/JsonSerializationVerifier.java | 22 +++- mailbox/api/pom.xml | 4 +- .../apache/james/mailbox/AttachmentIdFactory.java | 11 +- .../mailbox/StringBackedAttachmentIdFactory.java | 20 ++-- .../mailbox/events/MailboxIdRegistrationKey.java | 2 +- .../apache/james/mailbox/model/AttachmentId.java | 59 +--------- ...chmentId.java => StringBackedAttachmentId.java} | 18 +-- .../org/apache/james/mailbox/model/ThreadId.java | 2 +- .../mailbox/model/AttachmentMetadataTest.java | 6 +- .../model/MessageAttachmentMetadataTest.java | 12 +- ...Test.java => StringBackedAttachmentIdTest.java} | 14 +-- .../james/mailbox/backup/DefaultMailboxBackup.java | 2 +- .../mailbox/backup/ZipMailArchiveRestorer.java | 2 +- .../apache/james/mailbox/backup/zip/Zipper.java | 2 +- mailbox/cassandra/pom.xml | 4 +- .../mailbox/cassandra/CassandraMailboxManager.java | 2 +- .../CassandraMailboxSessionMapperFactory.java | 5 +- .../CassandraThreadIdGuessingAlgorithm.java | 2 +- .../mailbox/cassandra/DeleteMessageListener.java | 2 +- .../mail/AttachmentBlobReferenceSource.java | 2 +- .../mailbox/cassandra/mail/CassandraACLDAOV2.java | 2 +- .../mailbox/cassandra/mail/CassandraACLMapper.java | 2 +- .../cassandra/mail/CassandraAnnotationMapper.java | 2 +- .../cassandra/mail/CassandraApplicableFlagDAO.java | 3 +- .../cassandra/mail/CassandraAttachmentDAOV2.java | 5 +- .../cassandra/mail/CassandraAttachmentMapper.java | 9 +- .../cassandra/mail/CassandraDeletedMessageDAO.java | 2 +- .../cassandra/mail/CassandraFirstUnseenDAO.java | 2 +- .../cassandra/mail/CassandraIndexTableHandler.java | 3 +- .../cassandra/mail/CassandraMailboxCounterDAO.java | 2 +- .../cassandra/mail/CassandraMailboxDAO.java | 2 +- .../cassandra/mail/CassandraMailboxMapper.java | 2 +- .../cassandra/mail/CassandraMailboxPathV3DAO.java | 2 +- .../cassandra/mail/CassandraMailboxRecentsDAO.java | 2 +- .../cassandra/mail/CassandraMessageDAOV3.java | 6 +- .../cassandra/mail/CassandraMessageIdDAO.java | 3 +- .../mail/CassandraMessageIdToImapUidDAO.java | 3 +- .../cassandra/mail/CassandraModSeqProvider.java | 2 +- .../mailbox/cassandra/mail/CassandraThreadDAO.java | 2 +- .../cassandra/mail/CassandraThreadLookupDAO.java | 2 +- .../cassandra/mail/CassandraUidProvider.java | 2 +- .../mail/CassandraUserMailboxRightsDAO.java | 2 +- .../mail/MessageAttachmentRepresentation.java | 12 +- .../cassandra/mail/MessageBlobReferenceSource.java | 2 +- .../mail/task/MailboxMergingTaskRunner.java | 2 +- .../mail/task/RecomputeMailboxCountersService.java | 3 +- .../task/SolveMailboxInconsistenciesService.java | 2 +- .../task/SolveMessageInconsistenciesService.java | 3 +- .../quota/CassandraCurrentQuotaManagerV1.java | 2 +- .../quota/CassandraCurrentQuotaManagerV2.java | 2 +- .../quota/CassandraGlobalMaxQuotaDao.java | 2 +- .../quota/CassandraPerDomainMaxQuotaDao.java | 2 +- .../quota/CassandraPerUserMaxQuotaDao.java | 2 +- .../quota/CassandraPerUserMaxQuotaManagerV1.java | 2 +- .../quota/CassandraPerUserMaxQuotaManagerV2.java | 2 +- .../quota/FakeCassandraCurrentQuotaManager.java | 2 +- .../CassandraCurrentQuotaManagerMigration.java | 4 +- .../CassandraPerUserMaxQuotaManagerMigration.java | 4 +- .../cassandra/search/AllSearchOverride.java | 2 +- .../cassandra/search/DeletedSearchOverride.java | 3 +- .../search/DeletedWithRangeSearchOverride.java | 3 +- .../search/NotDeletedWithRangeSearchOverride.java | 3 +- .../cassandra/search/UidSearchOverride.java | 2 +- .../cassandra/search/UnseenSearchOverride.java | 3 +- .../cassandra/CassandraMailboxManagerTest.java | 3 +- .../cassandra/mail/AttachmentLoaderTest.java | 12 +- .../mail/CassandraAttachmentDAOV2Test.java | 8 +- .../MessageAttachmentRepresentationByIdTest.java | 10 +- ...omputeMailboxCountersTaskSerializationTest.java | 4 +- .../SolveMailboxInconsistenciesServiceTest.java | 5 +- ...essageInconsistenciesTaskSerializationTest.java | 8 +- .../mailbox/cassandra/mail/utils/GuiceUtils.java | 5 +- .../james/event/json/MailboxEventSerializer.scala | 2 +- mailbox/jpa/pom.xml | 17 +++ .../jpa/JPAMailboxSessionMapperFactory.java | 6 +- .../james/mailbox/jpa/JPATransactionalMapper.java | 8 +- .../mailbox/jpa/mail/JPAAnnotationMapper.java | 6 +- .../mailbox/jpa/mail/JPAAttachmentMapper.java | 9 +- .../james/mailbox/jpa/mail/JPAMailboxMapper.java | 12 +- .../james/mailbox/jpa/mail/JPAMessageMapper.java | 7 +- .../james/mailbox/jpa/mail/JPAModSeqProvider.java | 8 +- .../james/mailbox/jpa/mail/JPAUidProvider.java | 8 +- .../mailbox/jpa/mail/model/JPAAttachment.java | 24 ++-- .../james/mailbox/jpa/mail/model/JPAMailbox.java | 16 +-- .../jpa/mail/model/JPAMailboxAnnotation.java | 16 +-- .../jpa/mail/model/JPAMailboxAnnotationId.java | 2 +- .../james/mailbox/jpa/mail/model/JPAProperty.java | 12 +- .../james/mailbox/jpa/mail/model/JPAUserFlag.java | 12 +- .../model/openjpa/AbstractJPAMailboxMessage.java | 31 +++-- .../model/openjpa/JPAEncryptedMailboxMessage.java | 13 +-- .../jpa/mail/model/openjpa/JPAMailboxMessage.java | 13 +-- .../JPAMailboxMessageWithAttachmentStorage.java | 19 ++- .../model/openjpa/JPAStreamingMailboxMessage.java | 9 +- .../mailbox/jpa/openjpa/OpenJPAMailboxManager.java | 2 +- .../mailbox/jpa/quota/JPAPerUserMaxQuotaDAO.java | 6 +- .../jpa/quota/JPAPerUserMaxQuotaManager.java | 6 +- .../mailbox/jpa/quota/JpaCurrentQuotaManager.java | 6 +- .../mailbox/jpa/quota/model/JpaCurrentQuota.java | 8 +- .../jpa/quota/model/MaxDomainMessageCount.java | 8 +- .../mailbox/jpa/quota/model/MaxDomainStorage.java | 8 +- .../jpa/quota/model/MaxGlobalMessageCount.java | 8 +- .../mailbox/jpa/quota/model/MaxGlobalStorage.java | 8 +- .../jpa/quota/model/MaxUserMessageCount.java | 8 +- .../mailbox/jpa/quota/model/MaxUserStorage.java | 8 +- .../mailbox/jpa/user/JPASubscriptionMapper.java | 10 +- .../mailbox/jpa/user/model/JPASubscription.java | 18 +-- .../main/resources/META-INF/spring/mailbox-jpa.xml | 16 +-- .../src/main/resources/james-database.properties | 4 - .../mailbox/jpa/JPASubscriptionManagerTest.java | 2 +- .../mailbox/jpa/JpaMailboxManagerProvider.java | 2 +- .../james/mailbox/jpa/mail/JPAMapperProvider.java | 2 +- .../mailbox/jpa/mail/JpaMailboxMapperTest.java | 2 +- .../task/JPARecomputeCurrentQuotasServiceTest.java | 2 +- mailbox/lucene/pom.xml | 4 +- .../lucene/search/LuceneMessageSearchIndex.java | 5 +- mailbox/memory/pom.xml | 6 + .../mailbox/inmemory/InMemoryMailboxManager.java | 2 +- .../InMemoryMailboxSessionMapperFactory.java | 2 +- .../inmemory/mail/InMemoryAttachmentMapper.java | 3 +- .../quota/InMemoryCurrentQuotaManager.java | 2 +- mailbox/opensearch/pom.xml | 4 +- .../DisabledListeningMessageSearchIndex.java | 3 +- .../OpenSearchListeningMessageSearchIndex.java | 5 +- .../opensearch/json/MessageToOpenSearchJson.java | 3 +- .../mailbox/opensearch/query/QueryConverter.java | 2 +- .../OpenSearchListeningMessageSearchIndexTest.java | 4 +- .../opensearch/json/IndexableMessageTest.java | 5 +- .../CassandraDeletedMessageMetadataVault.java | 2 +- .../DeletedMessageVaultDeletionCallback.java | 2 +- .../apache/james/vault/metadata/MetadataDAO.java | 2 +- .../james/vault/metadata/MetadataSerializer.java | 2 +- .../vault/metadata/StorageInformationDAO.java | 2 +- .../james/vault/metadata/UserPerBucketDAO.java | 2 +- .../james/vault/DeletedMessageVaultHook.java | 2 +- .../vault/blob/BlobStoreDeletedMessageVault.java | 2 +- .../blob/BlobStoreVaultGarbageCollectionTask.java | 2 +- .../james/vault/blob/BucketNameGenerator.java | 2 +- ...etedMessageWithStorageInformationConverter.java | 3 +- .../vault/dto/query/QueryElementSerializer.java | 2 +- .../james/vault/dto/query/QueryTranslator.java | 3 +- .../james/vault/DeletedMessageConverterTest.java | 4 +- mailbox/plugin/quota-mailing/pom.xml | 4 +- .../listeners/QuotaThresholdCrossingListener.java | 2 +- .../events/OpenSearchQuotaMailboxListener.java | 4 +- .../json/QuotaRatioToOpenSearchJson.java | 2 +- .../quota/search/scanning/ClauseConverter.java | 2 +- .../search/scanning/ScanningQuotaSearcher.java | 2 +- .../james/mailbox/spring/MailboxInitializer.java | 2 +- mailbox/spring/src/main/resources/log4j.properties | 1 - .../META-INF/org/apache/james/database.properties | 1 - mailbox/store/pom.xml | 4 +- .../mailbox/store/MailboxManagerConfiguration.java | 2 +- .../james/mailbox/store/PreDeletionHooks.java | 2 +- .../james/mailbox/store/SessionProviderImpl.java | 2 +- .../mailbox/store/StoreAttachmentManager.java | 2 +- .../store/StoreMailboxAnnotationManager.java | 2 +- .../james/mailbox/store/StoreMailboxManager.java | 2 +- .../james/mailbox/store/StoreMessageIdManager.java | 3 +- .../james/mailbox/store/StoreRightManager.java | 3 +- .../mailbox/store/StoreSubscriptionManager.java | 2 +- .../mailbox/store/SystemMailboxesProviderImpl.java | 2 +- .../store/event/MailboxAnnotationListener.java | 2 +- .../store/event/MailboxSubscriptionListener.java | 2 +- .../mail/SearchThreadIdGuessingAlgorithm.java | 2 +- .../store/quota/CurrentQuotaCalculator.java | 2 +- .../store/quota/DefaultUserQuotaRootResolver.java | 2 +- .../store/quota/ListeningCurrentQuotaUpdater.java | 2 +- .../james/mailbox/store/quota/QuotaComponents.java | 2 +- .../mailbox/store/quota/StoreQuotaManager.java | 2 +- .../store/search/SimpleMessageSearchIndex.java | 2 +- .../mailbox/store/StoreAttachmentManagerTest.java | 4 +- .../store/mail/model/AttachmentMapperTest.java | 15 ++- .../mail/model/impl/SimpleMailboxMessageTest.java | 4 +- .../james/mailbox/tika/TikaTextExtractor.java | 2 +- mailbox/tools/indexer/pom.xml | 4 +- .../tools/indexer/ErrorRecoveryIndexationTask.java | 2 +- .../mailbox/tools/indexer/FullReindexingTask.java | 2 +- .../tools/indexer/MessageIdReIndexerImpl.java | 2 +- .../tools/indexer/MessageIdReIndexingTask.java | 2 +- .../mailbox/tools/indexer/ReIndexerImpl.java | 2 +- .../mailbox/tools/indexer/ReIndexerPerformer.java | 3 +- .../tools/indexer/SingleMailboxReindexingTask.java | 2 +- .../tools/indexer/SingleMessageReindexingTask.java | 2 +- .../mailbox/tools/indexer/UserReindexingTask.java | 2 +- ...rorRecoveryIndexationTaskSerializationTest.java | 7 +- .../FullReindexingTaskSerializationTest.java | 7 +- ...ngleMailboxReindexingTaskSerializationTest.java | 7 +- .../UserReindexingTaskSerializationTest.java | 8 +- .../mailbox/tools/jpa/migrator/JpaMigrator.java | 6 +- .../migrator/command/IMAP165JpaMigrateCommand.java | 2 +- .../migrator/command/IMAP168JpaMigrateCommand.java | 4 +- .../migrator/command/IMAP172JpaMigrateCommand.java | 2 +- .../migrator/command/IMAP176JpaMigrateCommand.java | 2 +- .../migrator/command/IMAP180JpaMigrateCommand.java | 4 +- .../migrator/command/IMAP184JpaMigrateCommand.java | 2 +- .../jpa/migrator/command/JpaMigrateCommand.java | 2 +- .../jpa/migrator/command/JpaMigrateQuery.java | 4 +- .../quota/task/RecomputeCurrentQuotasService.java | 2 +- .../task/RecomputeMailboxCurrentQuotasService.java | 2 +- .../RecomputeSieveUploadCurrentQuotasService.java | 2 +- .../RecomputeCurrentQuotasServiceContract.java | 5 +- ...ecomputeCurrentQuotasTaskSerializationTest.java | 7 +- mailet/ai/pom.xml | 4 +- .../apache/james/ai/classic/BayesianAnalysis.java | 2 +- .../james/ai/classic/BayesianAnalysisFeeder.java | 2 +- mailet/amqp/pom.xml | 4 +- .../transport/mailets/AmqpForwardAttribute.java | 4 +- mailet/crypto/pom.xml | 4 +- .../james/transport/mailets/AbstractSign.java | 3 +- mailet/standard/pom.xml | 4 +- .../apache/james/transport/mailets/Expires.java | 3 +- .../transport/matchers/IsFromMailingList.java | 3 +- metrics/metrics-dropwizard/pom.xml | 8 +- .../dropwizard/DropWizardGaugeRegistry.java | 4 +- .../metrics/dropwizard/DropWizardJVMMetrics.java | 2 +- .../dropwizard/DropWizardMetricFactory.java | 6 +- .../SelectThenFetchWithExistingMessages.test | 2 +- .../mpt/imapmailbox/jpa/host/JPAHostSystem.java | 2 +- pom.xml | 129 ++++++++------------- .../imap/api/process/DefaultMailboxTyper.java | 2 +- .../imap/decode/parser/AppendCommandParser.java | 3 +- .../decode/parser/AuthenticateCommandParser.java | 2 +- .../decode/parser/CapabilityCommandParser.java | 2 +- .../imap/decode/parser/CheckCommandParser.java | 2 +- .../imap/decode/parser/CloseCommandParser.java | 2 +- .../imap/decode/parser/CompressCommandParser.java | 2 +- .../imap/decode/parser/CopyCommandParser.java | 2 +- .../imap/decode/parser/CreateCommandParser.java | 2 +- .../imap/decode/parser/DeleteACLCommandParser.java | 2 +- .../imap/decode/parser/DeleteCommandParser.java | 2 +- .../imap/decode/parser/EnableCommandParser.java | 2 +- .../imap/decode/parser/ExamineCommandParser.java | 2 +- .../imap/decode/parser/ExpungeCommandParser.java | 2 +- .../imap/decode/parser/FetchCommandParser.java | 2 +- .../imap/decode/parser/GetACLCommandParser.java | 2 +- .../decode/parser/GetMetadataCommandParser.java | 2 +- .../imap/decode/parser/GetQuotaCommandParser.java | 2 +- .../decode/parser/GetQuotaRootCommandParser.java | 2 +- .../james/imap/decode/parser/IDCommandParser.java | 2 +- .../imap/decode/parser/IdleCommandParser.java | 2 +- .../imap/decode/parser/ListCommandParser.java | 2 +- .../decode/parser/ListRightsCommandParser.java | 2 +- .../imap/decode/parser/LoginCommandParser.java | 2 +- .../imap/decode/parser/LogoutCommandParser.java | 2 +- .../imap/decode/parser/LsubCommandParser.java | 2 +- .../imap/decode/parser/MoveCommandParser.java | 2 +- .../imap/decode/parser/MyRightsCommandParser.java | 2 +- .../imap/decode/parser/NamespaceCommandParser.java | 2 +- .../imap/decode/parser/NoopCommandParser.java | 2 +- .../imap/decode/parser/RenameCommandParser.java | 2 +- .../imap/decode/parser/SearchCommandParser.java | 2 +- .../imap/decode/parser/SelectCommandParser.java | 2 +- .../imap/decode/parser/SetACLCommandParser.java | 2 +- .../decode/parser/SetAnnotationCommandParser.java | 2 +- .../imap/decode/parser/SetQuotaCommandParser.java | 2 +- .../imap/decode/parser/StartTLSCommandParser.java | 2 +- .../imap/decode/parser/StatusCommandParser.java | 2 +- .../imap/decode/parser/StoreCommandParser.java | 3 +- .../imap/decode/parser/SubscribeCommandParser.java | 2 +- .../james/imap/decode/parser/UidCommandParser.java | 2 +- .../imap/decode/parser/UnselectCommandParser.java | 2 +- .../decode/parser/UnsubscribeCommandParser.java | 2 +- .../imap/decode/parser/XListCommandParser.java | 2 +- .../imap/encode/ContinuationResponseEncoder.java | 2 +- .../james/imap/encode/FetchResponseEncoder.java | 3 +- .../james/imap/encode/StatusResponseEncoder.java | 2 +- .../james/imap/processor/AppendProcessor.java | 3 +- .../imap/processor/AuthenticateProcessor.java | 2 +- .../james/imap/processor/CapabilityProcessor.java | 2 +- .../james/imap/processor/CheckProcessor.java | 2 +- .../james/imap/processor/CloseProcessor.java | 2 +- .../james/imap/processor/CompressProcessor.java | 2 +- .../apache/james/imap/processor/CopyProcessor.java | 2 +- .../james/imap/processor/CreateProcessor.java | 2 +- .../james/imap/processor/DeleteACLProcessor.java | 2 +- .../james/imap/processor/DeleteProcessor.java | 2 +- .../james/imap/processor/EnableProcessor.java | 2 +- .../james/imap/processor/ExamineProcessor.java | 2 +- .../james/imap/processor/ExpungeProcessor.java | 2 +- .../james/imap/processor/GetACLProcessor.java | 2 +- .../james/imap/processor/GetMetadataProcessor.java | 2 +- .../james/imap/processor/GetQuotaProcessor.java | 2 +- .../imap/processor/GetQuotaRootProcessor.java | 2 +- .../apache/james/imap/processor/IdProcessor.java | 2 +- .../apache/james/imap/processor/IdleProcessor.java | 2 +- .../apache/james/imap/processor/LSubProcessor.java | 2 +- .../apache/james/imap/processor/ListProcessor.java | 2 +- .../james/imap/processor/ListRightsProcessor.java | 2 +- .../james/imap/processor/LoginProcessor.java | 2 +- .../james/imap/processor/LogoutProcessor.java | 2 +- .../apache/james/imap/processor/MoveProcessor.java | 2 +- .../james/imap/processor/MyRightsProcessor.java | 2 +- .../james/imap/processor/NamespaceProcessor.java | 2 +- .../apache/james/imap/processor/NoopProcessor.java | 2 +- .../james/imap/processor/RenameProcessor.java | 2 +- .../james/imap/processor/SearchProcessor.java | 3 +- .../james/imap/processor/SelectProcessor.java | 2 +- .../james/imap/processor/SetACLProcessor.java | 2 +- .../james/imap/processor/SetMetadataProcessor.java | 2 +- .../james/imap/processor/SetQuotaProcessor.java | 2 +- .../james/imap/processor/StartTLSProcessor.java | 2 +- .../james/imap/processor/StatusProcessor.java | 3 +- .../james/imap/processor/StoreProcessor.java | 3 +- .../james/imap/processor/SubscribeProcessor.java | 2 +- .../imap/processor/SystemMessageProcessor.java | 2 +- .../james/imap/processor/UnselectProcessor.java | 2 +- .../james/imap/processor/UnsubscribeProcessor.java | 2 +- .../james/imap/processor/XListProcessor.java | 2 +- .../james/imap/processor/fetch/FetchProcessor.java | 2 +- protocols/lmtp/pom.xml | 4 +- .../james/protocols/lmtp/core/LhloCmdHandler.java | 2 +- protocols/managesieve/pom.xml | 8 +- .../james/managesieve/core/CoreProcessor.java | 2 +- .../managesieve/transcode/ArgumentParser.java | 2 +- .../transcode/ManageSieveProcessor.java | 2 +- .../apache/james/protocols/netty/NettyServer.java | 2 +- .../pop3/core/AbstractApopCmdHandler.java | 2 +- .../james/protocols/pop3/core/CapaCmdHandler.java | 2 +- .../james/protocols/pop3/core/DeleCmdHandler.java | 2 +- .../james/protocols/pop3/core/ListCmdHandler.java | 2 +- .../james/protocols/pop3/core/NoopCmdHandler.java | 2 +- .../james/protocols/pop3/core/QuitCmdHandler.java | 2 +- .../james/protocols/pop3/core/RetrCmdHandler.java | 2 +- .../james/protocols/pop3/core/RsetCmdHandler.java | 2 +- .../james/protocols/pop3/core/StatCmdHandler.java | 2 +- .../james/protocols/pop3/core/StlsCmdHandler.java | 2 +- .../james/protocols/pop3/core/TopCmdHandler.java | 2 +- .../james/protocols/pop3/core/UidlCmdHandler.java | 2 +- .../james/protocols/pop3/core/UserCmdHandler.java | 2 +- protocols/smtp/pom.xml | 4 +- .../smtp/core/AbstractHookableCmdHandler.java | 2 +- .../james/protocols/smtp/core/DataCmdHandler.java | 2 +- .../james/protocols/smtp/core/HeloCmdHandler.java | 2 +- .../james/protocols/smtp/core/MailCmdHandler.java | 3 +- .../james/protocols/smtp/core/QuitCmdHandler.java | 2 +- .../james/protocols/smtp/core/RcptCmdHandler.java | 2 +- .../protocols/smtp/core/UnknownCmdHandler.java | 2 +- .../protocols/smtp/core/esmtp/EhloCmdHandler.java | 2 +- .../smtp/core/fastfail/SpamTrapHandler.java | 2 +- server/apps/cassandra-app/README.adoc | 2 +- server/apps/cassandra-app/pom.xml | 2 +- .../sample-configuration/mailetcontainer.xml | 5 +- .../src/assemble/license-for-binary.txt | 34 ------ .../org/apache/james/modules/TestTikaModule.java | 2 +- .../apps/cli/src/assemble/license-for-binary.txt | 34 ------ server/apps/distributed-app/README.adoc | 2 +- server/apps/distributed-app/pom.xml | 2 +- .../sample-configuration/mailetcontainer.xml | 5 +- .../src/assemble/license-for-binary.txt | 34 ------ .../apache/james/NamespaceConfigurationTest.java | 2 +- .../apache/james/modules/TestRabbitMQModule.java | 4 +- .../src/test/resources/mailetcontainer.xml | 5 +- server/apps/distributed-pop3-app/README.adoc | 2 +- server/apps/distributed-pop3-app/pom.xml | 2 +- .../sample-configuration/mailetcontainer.xml | 5 +- .../src/test/resources/mailetcontainer.xml | 5 +- server/apps/jpa-app/README.adoc | 2 +- server/apps/jpa-app/pom.xml | 2 +- .../sample-configuration/james-database.properties | 4 - .../sample-configuration/mailetcontainer.xml | 5 +- .../jpa-app/src/assemble/license-for-binary.txt | 34 ------ .../jpa-app/src/test/resources/mailetcontainer.xml | 5 +- server/apps/jpa-smtp-app/README.adoc | 2 +- server/apps/jpa-smtp-app/pom.xml | 2 +- .../sample-configuration/james-database.properties | 4 - .../sample-configuration/mailetcontainer.xml | 5 +- .../src/assemble/license-for-binary.txt | 34 ------ .../java/org/apache/james/JPAJamesServerTest.java | 2 +- .../mariadb/TestJPAMariaDBConfigurationModule.java | 2 +- .../src/test/resources/mailetcontainer.xml | 5 +- server/apps/memory-app/pom.xml | 2 +- .../sample-configuration/mailetcontainer.xml | 5 +- .../memory-app/src/assemble/license-for-binary.txt | 34 ------ .../apache/james/GuiceLifecycleHeathCheckTest.java | 4 +- .../src/test/resources/mailetcontainer.xml | 5 +- server/apps/scaling-pulsar-smtp/pom.xml | 2 +- .../sample-configuration/james-database.properties | 2 - .../sample-configuration/mailetcontainer.xml | 5 +- .../apache/james/MailStoreRepositoryModule.java | 2 +- .../java/org/apache/james/PulsarExtension.java | 2 +- .../src/test/resources/mailetcontainer.xml | 5 +- server/apps/spring-app/pom.xml | 5 - .../src/main/licensing/app/license-for-binary.txt | 34 ------ .../src/main/licensing/app/licensing.xml | 1 - .../src/main/licensing/war/licensing.xml | 1 - .../src/main/resources/james-database.properties | 4 - .../src/main/resources/jetm-monitoring.xml | 85 -------------- .../src/main/resources/mailetcontainer.xml | 6 +- .../james/app/spring/JamesSpringContextTest.java | 2 +- server/blob/blob-api/pom.xml | 4 +- .../apache/james/blob/api/MetricableBlobStore.java | 4 +- .../james/blob/api/ObjectStorageHealthCheck.java | 2 +- .../blob/cassandra/CassandraBlobStoreDAO.java | 4 +- .../james/blob/cassandra/CassandraBucketDAO.java | 2 +- .../blob/cassandra/CassandraDefaultBucketDAO.java | 2 +- .../blob/cassandra/cache/CachedBlobStore.java | 4 +- .../cassandra/cache/CassandraBlobStoreCache.java | 4 +- .../export/file/LocalFileBlobExportMechanism.java | 2 +- .../apache/james/blob/file/FileBlobStoreDAO.java | 2 +- server/blob/blob-s3/pom.xml | 4 +- .../blob/objectstorage/aws/S3BlobStoreDAO.java | 6 +- .../deduplication/DeDuplicationBlobStore.scala | 2 +- .../blob/deduplication/PassThroughBlobStore.scala | 2 +- .../BlobGCTaskAdditionalInformationDTOTest.java | 4 +- .../deduplication/BlobGCTaskSerializationTest.java | 5 +- .../apache/james/blob/mail/MimeMessageStore.java | 3 +- .../james/healthcheck/MailReceptionCheck.java | 3 +- ...obStoreConfigurationValidationStartUpCheck.java | 2 +- .../validation/EventsourcingStorageStrategy.java | 2 +- ...orageStrategyValidationEventSourcingSystem.java | 2 +- .../james/modules/BlobExportMechanismModule.java | 2 +- .../modules/objectstorage/S3BlobStoreModule.java | 2 +- .../modules/objectstorage/S3BucketModule.java | 4 +- .../modules/mailbox/CassandraMailboxModule.java | 5 +- .../org/apache/james/server/CassandraProbe.java | 2 +- .../james/server/CassandraTruncateTableTask.java | 2 +- .../org/apache/james/CleanupTasksPerformer.java | 4 +- .../james/ConfigurationSanitizingPerformer.java | 2 +- .../java/org/apache/james/GuiceJamesServer.java | 2 +- .../apache/james/GuiceLifecycleHealthCheck.java | 2 +- .../org/apache/james/PeriodicalHealthChecks.java | 6 +- .../org/apache/james/StartUpChecksPerformer.java | 2 +- .../apache/james/modules/CommonServicesModule.java | 2 +- .../james/modules/server/LoggingMetricsModule.java | 6 +- .../modules/server/MailStoreRepositoryModule.java | 2 +- .../java/org/apache/james/utils/DataProbeImpl.java | 2 +- .../james/utils/FilteringManagementProbeImpl.java | 2 +- .../org/apache/james/utils/GuiceProbeProvider.java | 2 +- .../james/utils/MailRepositoryProbeImpl.java | 2 +- .../modules/InitializationOperationsTest.java | 2 +- .../james/utils/FailingPropertiesProvider.java | 2 +- .../james/utils/InitilizationOperationBuilder.java | 2 +- .../org/apache/james/utils/KeystoreCreator.java | 2 +- .../modules/DistributedTaskManagerModule.java | 2 +- .../DistributedTaskSerializationModule.java | 2 +- .../blobstore/BlobStoreCacheModulesChooser.java | 2 +- .../james/modules/event/JMAPEventBusModule.java | 2 +- ...ributedDeletedMessageVaultDeletionCallback.java | 17 +-- .../org/apache/james/modules/server/JMXServer.java | 5 +- .../james/modules/data/JPAEntityManagerModule.java | 6 +- .../apache/james/TestJPAConfigurationModule.java | 2 +- ...estJPAConfigurationModuleWithSqlValidation.java | 2 +- .../james/modules/mailbox/JPAMailboxModule.java | 5 +- .../DeletedMessageVaultConfigurationModule.java | 2 +- .../org/apache/james/modules/ACLProbeImpl.java | 2 +- .../apache/james/modules/ConfigurationProbe.java | 2 +- .../james/modules/EventDeadLettersProbe.java | 2 +- .../org/apache/james/modules/MailboxProbeImpl.java | 3 +- .../org/apache/james/modules/QuotaProbesImpl.java | 2 +- .../modules/mailbox/MailboxListenerFactory.java | 2 +- .../modules/mailbox/PreDeletionHookModule.java | 2 +- .../james/modules/mailbox/ConfiguredListener.java | 2 +- .../java/org/apache/james/utils/SpoolerProbe.java | 2 +- ...ustom-mailets-implementation-3.5.0-SNAPSHOT.jar | Bin 11069 -> 0 bytes ...ustom-mailets-implementation-3.9.0-SNAPSHOT.jar | Bin 0 -> 4174 bytes ...ilets-3.9.0-SNAPSHOT-jar-with-dependencies.jar} | Bin 30057150 -> 21380335 bytes .../guice/MultiBoundGuiceRepositoryLoader.java | 2 +- .../james/modules/mailbox/MemoryMailboxModule.java | 5 +- server/container/guice/onami/pom.xml | 4 +- .../james/onami/lifecycle/PreDestroyModule.java | 2 +- .../onami/lifecycle/MultiLifeCycleObject.java | 2 +- .../onami/lifecycle/MultiLifeCycleTestCase.java | 2 +- .../apache/james/onami/lifecycle/StageObject1.java | 2 +- .../apache/james/onami/lifecycle/StageObject2.java | 2 +- .../modules/mailbox/OpenSearchMailboxModule.java | 6 +- .../mailbox/OpenSearchQuotaSearcherModule.java | 2 +- .../modules/mailbox/OpenSearchStartUpCheck.java | 2 +- .../james/modules/mailbox/TikaMailboxModule.java | 2 +- .../protocols/ConnectionCheckFactoryImpl.java | 2 +- .../modules/protocols/DefaultImapPackage.java | 2 +- .../james/modules/protocols/ImapGuiceProbe.java | 4 +- .../jmap/draft/JMAPConfigurationStartUpCheck.java | 2 +- .../org/apache/james/jmap/draft/JMAPModule.java | 2 +- .../jmap/draft/JmapConfigurationSanitizer.java | 2 +- .../apache/james/jmap/draft/JmapGuiceProbe.java | 2 +- .../apache/james/jmap/draft/MessageIdProbe.java | 3 +- .../apache/james/jmap/draft/JMAPModuleTest.java | 42 +++---- .../apache/james/modules/TestJMAPServerModule.java | 2 +- .../james/modules/protocols/LmtpGuiceProbe.java | 2 +- .../james/modules/protocols/SieveProbeImpl.java | 2 +- server/container/guice/protocols/netty/pom.xml | 4 +- .../james/modules/protocols/Pop3GuiceProbe.java | 2 +- .../james/modules/protocols/SmtpGuiceProbe.java | 2 +- .../apache/james/modules/server/NoJwtModule.java | 2 +- .../james/modules/server/WebAdminServerModule.java | 2 +- .../org/apache/james/utils/WebAdminGuiceProbe.java | 2 +- .../queue/activemq/ActiveMQQueueModule.java | 2 +- .../pulsar/module/PulsarMailQueueViewModule.java | 4 +- .../queue/pulsar/module/PulsarQueueModule.java | 5 +- .../rabbitmq/CassandraMailQueueViewModule.java | 4 +- .../queue/rabbitmq/FakeMailQueueViewModule.java | 2 +- .../queue/rabbitmq/RabbitMQMailQueueModule.java | 4 +- .../modules/queue/rabbitmq/RabbitMQModule.java | 6 +- .../queue/rabbitmq/SpoolerReconnectionHandler.java | 2 +- .../james/transport/mailets/MyGenericMailet.java | 3 +- .../apache/james/utils/ExtendedClassLoader.java | 2 +- .../org/apache/james/utils/UserStartables.java | 2 +- .../org/apache/james/lifecycle/api/Disposable.java | 2 +- .../apache/james/lifecycle/api/LeakAwareTest.java | 33 ++---- .../adapter/mailbox/ACLUsernameChangeTaskStep.java | 2 +- .../mailbox/DelegationStoreAuthorizator.java | 2 +- .../mailbox/MailboxUserDeletionTaskStep.java | 2 +- .../mailbox/MailboxUsernameChangeTaskStep.java | 2 +- .../mailbox/QuotaUsernameChangeTaskStep.java | 2 +- .../mailbox/UserRepositoryAuthenticator.java | 2 +- .../mailbox/UserRepositoryAuthorizator.java | 2 +- .../adapter/mailbox/MailboxCopierManagement.java | 4 +- .../adapter/mailbox/MailboxManagerManagement.java | 5 +- .../james/adapter/mailbox/QuotaManagement.java | 2 +- .../james/adapter/mailbox/ReIndexerManagement.java | 4 +- server/container/spring/pom.xml | 8 +- .../MailRepositoryStoreBeanFactory.java | 2 +- .../spring/resource/SpringUserEntityValidator.java | 2 +- .../spring/rmi/RmiRegistryFactoryBean.java | 46 +++----- .../apache/james/spring-mailbox-authenticator.xml | 2 +- .../apache/james/spring-mailbox-authorizator.xml | 2 +- .../META-INF/org/apache/james/spring-server.xml | 29 +++-- server/container/util/pom.xml | 4 +- .../james/util/date/ZonedDateTimeProvider.java | 2 +- .../james/rrt/ForwardUsernameChangeTaskStep.java | 2 +- .../RecipientRewriteTableUserDeletionTaskStep.java | 2 +- .../api/SieveCurrentUploadUsageCalculator.java | 2 +- .../user/api/DelegationUserDeletionTaskStep.java | 2 +- .../user/api/DelegationUsernameChangeTaskStep.java | 2 +- .../vacation/api/VacationDeleteUserTaskStep.java | 2 +- server/data/data-cassandra/pom.xml | 12 +- .../domainlist/cassandra/CassandraDomainList.java | 2 +- .../rrt/cassandra/CassandraMappingsSourcesDAO.java | 2 +- .../cassandra/CassandraRecipientRewriteTable.java | 2 +- .../CassandraRecipientRewriteTableDAO.java | 2 +- .../migration/MappingsSourcesMigration.java | 2 +- .../sieve/cassandra/CassandraActiveScriptDAO.java | 2 +- .../james/sieve/cassandra/CassandraSieveDAO.java | 2 +- .../sieve/cassandra/CassandraSieveQuotaDAOV1.java | 2 +- .../sieve/cassandra/CassandraSieveQuotaDAOV2.java | 2 +- .../sieve/cassandra/CassandraSieveRepository.java | 2 +- .../james/sieve/cassandra/FakeSieveQuotaDAO.java | 2 +- .../cassandra/migration/SieveQuotaMigration.java | 4 +- .../user/cassandra/CassandraDelegationStore.java | 2 +- .../james/user/cassandra/CassandraUsersDAO.java | 2 +- .../cassandra/CassandraNotificationRegistry.java | 2 +- .../CassandraNotificationRegistryDAO.java | 2 +- .../vacation/cassandra/CassandraVacationDAO.java | 2 +- .../cassandra/CassandraVacationRepository.java | 2 +- .../james/rrt/cassandra/CassandraStepdefs.java | 4 +- .../james/rrt/cassandra/RewriteTablesTest.java | 17 +-- server/data/data-file/pom.xml | 11 +- .../apache/james/domainlist/xml/XMLDomainList.java | 4 +- .../mailrepository/file/FileMailRepository.java | 5 +- .../sieverepository/file/SieveFileRepository.java | 2 +- .../apache/james/rrt/file/RewriteTablesTest.java | 20 ++-- .../org/apache/james/rrt/file/XMLStepdefs.java | 2 +- server/data/data-jmap-cassandra/pom.xml | 4 +- .../cassandra/access/CassandraAccessTokenDAO.java | 4 +- .../access/CassandraAccessTokenRepository.java | 2 +- .../change/CassandraEmailChangeRepository.java | 4 +- .../change/CassandraMailboxChangeRepository.java | 4 +- .../cassandra/change/EmailChangeRepositoryDAO.java | 2 +- .../change/MailboxChangeRepositoryDAO.java | 2 +- .../filtering/CassandraFilteringProjection.java | 2 +- .../projections/CassandraEmailQueryView.java | 2 +- .../CassandraMessageFastViewProjection.java | 2 +- .../CassandraPushSubscriptionDAO.java | 2 +- .../CassandraPushSubscriptionRepository.java | 2 +- .../upload/CassandraUploadRepository.java | 2 +- .../upload/CassandraUploadUsageRepository.java | 2 +- .../james/jmap/cassandra/upload/UploadDAO.java | 2 +- .../identity/CassandraCustomIdentityDAO.scala | 2 +- .../james/jmap/cassandra/filtering/DTOTest.java | 28 +++-- server/data/data-jmap/pom.xml | 4 +- .../jmap/api/change/MailboxAndEmailChange.java | 3 +- .../james/jmap/api/change/MailboxChange.java | 2 +- .../filtering/FiltersDeleteUserDataTaskStep.java | 2 +- .../impl/EventSourcingFilteringManagement.java | 2 +- .../impl/FilterUsernameChangeTaskStep.java | 2 +- .../org/apache/james/jmap/api/model/Preview.java | 2 +- .../MessageFastViewPrecomputedProperties.java | 2 +- .../MessageFastViewProjectionHealthCheck.java | 2 +- .../PushDeleteUserDataTaskStep.java | 2 +- .../upload/JMAPCurrentUploadUsageCalculator.java | 2 +- .../RecomputeJMAPUploadCurrentQuotasService.java | 2 +- .../jmap/api/upload/UploadServiceDefaultImpl.java | 4 +- .../memory/access/MemoryAccessTokenRepository.java | 4 +- .../memory/change/MemoryEmailChangeRepository.java | 4 +- .../change/MemoryMailboxChangeRepository.java | 4 +- .../memory/projections/MemoryEmailQueryView.java | 2 +- .../MemoryMessageFastViewProjection.java | 2 +- .../MemoryPushSubscriptionRepository.java | 2 +- .../memory/upload/InMemoryUploadRepository.java | 2 +- .../james/jmap/api/change/TypeStateFactory.scala | 2 +- .../jmap/api/identity/CustomIdentityDAO.scala | 2 +- server/data/data-jpa/pom.xml | 16 ++- .../apache/james/domainlist/jpa/JPADomainList.java | 16 +-- .../james/domainlist/jpa/model/JPADomain.java | 12 +- .../james/jpa/healthcheck/JPAHealthCheck.java | 4 +- .../mailrepository/jpa/JPAMailRepository.java | 13 +-- .../jpa/JPAMailRepositoryFactory.java | 4 +- .../jpa/JPAMailRepositoryUrlStore.java | 4 +- .../james/mailrepository/jpa/model/JPAMail.java | 22 ++-- .../james/mailrepository/jpa/model/JPAUrl.java | 12 +- .../james/rrt/jpa/JPARecipientRewriteTable.java | 12 +- .../james/rrt/jpa/model/JPARecipientRewrite.java | 14 +-- .../apache/james/sieve/jpa/JPASieveRepository.java | 12 +- .../james/sieve/jpa/model/JPASieveQuota.java | 12 +- .../james/sieve/jpa/model/JPASieveScript.java | 12 +- .../org/apache/james/user/jpa/JPAUsersDAO.java | 10 +- .../apache/james/user/jpa/JPAUsersRepository.java | 8 +- .../org/apache/james/user/jpa/model/JPAUser.java | 16 +-- .../java/org/apache/james/rrt/jpa/JPAStepdefs.java | 5 +- .../apache/james/rrt/jpa/RewriteTablesTest.java | 17 +-- server/data/data-ldap/pom.xml | 4 +- .../apache/james/user/ldap/LdapHealthCheck.java | 2 +- .../james/user/ldap/ReadOnlyLDAPUsersDAO.java | 5 +- .../user/ldap/ReadOnlyUsersLDAPRepository.java | 4 +- server/data/data-library/pom.xml | 13 ++- .../apache/james/DefaultUserEntityValidator.java | 2 +- .../org/apache/james/DefaultVacationService.java | 2 +- .../RecipientRewriteTableUserEntityValidator.java | 2 +- .../EventSourcingDLPConfigurationStore.java | 2 +- .../james/domainlist/lib/DomainListManagement.java | 3 +- .../repository/file/AbstractFileRepository.java | 4 +- .../rrt/lib/AbstractRecipientRewriteTable.java | 3 +- .../james/rrt/lib/AliasReverseResolverImpl.java | 2 +- .../org/apache/james/rrt/lib/CanSendFromImpl.java | 2 +- .../rrt/lib/RecipientRewriteTableManagement.java | 3 +- .../lib/SieveRepositoryManagement.java | 3 +- .../apache/james/user/lib/UsersRepositoryImpl.java | 2 +- .../james/user/lib/UsersRepositoryManagement.java | 3 +- .../james/rrt/lib/RewriteTablesStepdefs.java | 83 ++++++++----- server/data/data-memory/pom.xml | 12 +- .../james/domainlist/memory/MemoryDomainList.java | 2 +- .../memory/MemoryNotificationRegistry.java | 2 +- .../apache/james/rrt/memory/InMemoryStepdefs.java | 2 +- .../apache/james/rrt/memory/RewriteTablesTest.java | 17 +-- server/dns-service/dnsservice-dnsjava/pom.xml | 8 +- .../james/dnsservice/dnsjava/DNSJavaService.java | 4 +- .../org/apache/james/jdkim/mailets/DKIMSign.java | 3 +- .../org/apache/james/jdkim/mailets/DKIMVerify.java | 3 +- server/mailet/mailetcontainer-impl/pom.xml | 8 +- .../impl/CompositeProcessorImpl.java | 4 +- .../mailetcontainer/impl/JamesMailSpooler.java | 7 +- .../mailetcontainer/impl/JamesMailetContext.java | 5 +- .../mailetcontainer/impl/LocalResourcesImpl.java | 3 +- .../mailetcontainer/impl/MailetProcessorImpl.java | 3 +- .../lib/AbstractStateCompositeProcessor.java | 5 +- .../lib/AbstractStateMailetProcessor.java | 7 +- server/mailet/mailets/pom.xml | 4 +- .../org/apache/james/transport/mailets/Bounce.java | 3 +- .../apache/james/transport/mailets/DSNBounce.java | 3 +- .../apache/james/transport/mailets/Forward.java | 3 +- .../james/transport/mailets/FromRepository.java | 3 +- .../james/transport/mailets/LocalDelivery.java | 5 +- .../james/transport/mailets/MetricsMailet.java | 3 +- .../james/transport/mailets/NotifyPostmaster.java | 3 +- .../james/transport/mailets/NotifySender.java | 3 +- .../james/transport/mailets/RandomStoring.java | 3 +- .../transport/mailets/RecipientRewriteTable.java | 3 +- .../apache/james/transport/mailets/Redirect.java | 3 +- .../james/transport/mailets/RemoteDelivery.java | 3 +- .../apache/james/transport/mailets/Requeue.java | 3 +- .../org/apache/james/transport/mailets/Resend.java | 3 +- .../org/apache/james/transport/mailets/SPF.java | 3 +- .../org/apache/james/transport/mailets/Sieve.java | 3 +- .../james/transport/mailets/ToPlainText.java | 3 +- .../james/transport/mailets/ToRepository.java | 3 +- .../mailets/ToSenderDomainRepository.java | 3 +- .../james/transport/mailets/ToSenderFolder.java | 5 +- .../james/transport/mailets/VacationMailet.java | 3 +- .../james/transport/mailets/WhiteListManager.java | 2 +- .../transport/mailets/WithStorageDirective.java | 3 +- .../mailets/managesieve/ManageSieveMailet.java | 3 +- .../transport/matchers/AbstractNetworkMatcher.java | 3 +- .../matchers/AbstractSQLWhitelistMatcher.java | 2 +- .../transport/matchers/InSpammerBlacklist.java | 3 +- .../james/transport/matchers/IsOverQuota.java | 3 +- .../transport/matchers/IsSenderInRRTLoop.java | 2 +- .../transport/matchers/NetworkIsInWhitelist.java | 3 +- .../apache/james/transport/matchers/dlp/Dlp.java | 3 +- .../transport/matchers/dlp/DlpRulesLoader.java | 2 +- .../transport/util/MimeMessageBodyGenerator.java | 3 +- .../rate/limiter/redis/RedisRateLimiter.scala | 2 +- .../james/transport/mailets/GlobalRateLimit.scala | 2 +- .../transport/mailets/PerRecipientRateLimit.scala | 2 +- .../transport/mailets/PerSenderRateLimit.scala | 2 +- .../cassandra/CassandraMailRepository.java | 3 +- .../cassandra/CassandraMailRepositoryFactory.java | 2 +- .../cassandra/CassandraMailRepositoryKeysDAO.java | 2 +- .../CassandraMailRepositoryMailDaoV2.java | 3 +- .../cassandra/CassandraMailRepositoryUrlStore.java | 2 +- .../MailRepositoryBlobReferenceSource.java | 2 +- .../james/mailrepository/cassandra/UrlsDao.java | 2 +- .../memory/MemoryMailRepositoryStore.java | 2 +- server/protocols/fetchmail/pom.xml | 8 +- .../org/apache/james/fetchmail/FetchScheduler.java | 6 +- .../james/jmap/AllowAuthenticationStrategy.java | 2 +- .../methods/integration/SetMessagesMethodTest.java | 6 +- .../integration/cucumber/DownloadStepdefs.java | 10 +- .../cucumber/GetMailboxesMethodStepdefs.java | 10 +- .../cucumber/GetMessageListMethodStepdefs.java | 21 ++-- .../cucumber/GetMessagesMethodStepdefs.java | 85 +++++++++----- .../methods/integration/cucumber/HttpClient.java | 2 +- .../methods/integration/cucumber/ImapStepdefs.java | 10 +- .../methods/integration/cucumber/MainStepdefs.java | 2 +- .../integration/cucumber/MessageIdStepdefs.java | 4 +- .../cucumber/SetMailboxesMethodStepdefs.java | 10 +- .../cucumber/SetMessagesMethodStepdefs.java | 26 ++--- .../integration/cucumber/UploadStepdefs.java | 11 +- .../methods/integration/cucumber/UserStepdefs.java | 15 +-- .../resources/cucumber/DownloadEndpoint.feature | 2 +- .../test/resources/cucumber/DownloadGet.feature | 2 +- .../test/resources/cucumber/GetMessages.feature | 110 ++++++++---------- .../cucumber/ImapKeywordsConsistency.feature | 8 +- .../cucumber/sharing/CopyAndSharing.feature | 2 +- .../cucumber/sharing/DownloadAndSharing.feature | 2 +- .../cucumber/sharing/GetMessageAndSharing.feature | 8 +- .../KeywordsConsistencyOnDelegationMailbox.feature | 26 ++--- .../sharing/MailboxCreationAndSharing.feature | 2 +- .../cucumber/sharing/MoveMailboxAndSharing.feature | 2 +- .../cucumber/sharing/MoveMessageAndSharing.feature | 2 +- .../sharing/RenamingMailboxAndSharing.feature | 2 +- .../cucumber/sharing/SetFlagAndSharing.feature | 2 +- .../sharing/SetMessagesOnSharedMailbox.feature | 2 +- ...ringParentMailboxWithAndWithoutChildren.feature | 12 +- .../memory-jmap-draft-integration-testing/pom.xml | 7 +- .../cucumber/MemoryDownloadCucumberTest.java | 33 ------ .../MemoryDownloadEnpointCucumberTest.java} | 34 +++--- .../cucumber/MemoryDownloadGetCucumberTest.java} | 34 +++--- .../cucumber/MemoryDownloadPostCucumberTest.java} | 34 +++--- .../cucumber/MemoryGetMessagesMethodTest.java | 18 +-- .../MemoryIMAPKeywordsInconsistenciesTest.java | 18 +-- .../MemoryIMAPSetMessagesCompatibilityTest.java | 18 +-- .../MemorySetMailboxesMethodCucumberTest.java | 18 +-- .../MemorySetMessagesMethodCucumberTest.java | 18 +-- .../jmap/memory/cucumber/MemorySharingTest.java | 34 ++---- .../james/jmap/memory/cucumber/MemoryStepdefs.java | 10 +- .../memory/cucumber/MemoryUploadCucumberTest.java | 19 +-- .../pom.xml | 7 +- .../cucumber/awss3/CucumberAwsS3Singleton.java | 27 ----- .../cucumber/awss3/CucumberCassandraSingleton.java | 27 ----- .../awss3/CucumberOpenSearchSingleton.java | 27 ----- .../cucumber/awss3/CucumberRabbitMQSingleton.java | 26 ----- .../cucumber/awss3/RabbitMQAwsS3Stepdefs.java | 121 ------------------- .../awss3/RabbitMQDownloadCucumberTest.java | 37 ------ .../awss3/RabbitMQGetMessagesMethodTest.java | 37 ------ .../RabbitMQIMAPKeywordsInconsistenciesTest.java | 36 ------ .../RabbitMQIMAPSetMessagesCompatibilityTest.java | 36 ------ .../cucumber/awss3/RabbitMQMailboxSharingTest.java | 44 ------- .../cucumber/awss3/RabbitMQMessageSharingTest.java | 45 ------- .../RabbitMQSetMailboxesMethodCucumberTest.java | 37 ------ .../RabbitMQSetMessagesMethodCucumberTest.java | 37 ------ .../cucumber/awss3/RabbitMQUploadCucumberTest.java | 37 ------ server/protocols/jmap-draft/pom.xml | 4 +- .../jmap/draft/crypto/AccessTokenManagerImpl.java | 2 +- .../jmap/draft/crypto/JamesSignatureHandler.java | 2 +- .../james/jmap/draft/crypto/SecurityKeyLoader.java | 2 +- .../jmap/draft/crypto/SignedTokenFactory.java | 2 +- .../jmap/draft/crypto/SignedTokenManager.java | 2 +- .../james/jmap/draft/json/ObjectMapperFactory.java | 2 +- .../james/jmap/draft/methods/BlobManagerImpl.java | 12 +- .../james/jmap/draft/methods/GetFilterMethod.java | 2 +- .../jmap/draft/methods/GetMailboxesMethod.java | 2 +- .../jmap/draft/methods/GetMessageListMethod.java | 4 +- .../jmap/draft/methods/GetMessagesMethod.java | 2 +- .../draft/methods/GetVacationResponseMethod.java | 2 +- .../jmap/draft/methods/JmapRequestParserImpl.java | 2 +- .../jmap/draft/methods/JmapResponseWriterImpl.java | 2 +- .../jmap/draft/methods/MIMEMessageConverter.java | 2 +- .../james/jmap/draft/methods/MessageAppender.java | 3 +- .../james/jmap/draft/methods/MessageSender.java | 3 +- .../james/jmap/draft/methods/ReferenceUpdater.java | 3 +- .../james/jmap/draft/methods/RequestHandler.java | 2 +- .../james/jmap/draft/methods/SendMDNProcessor.java | 3 +- .../james/jmap/draft/methods/SetFilterMethod.java | 2 +- .../methods/SetMailboxesCreationProcessor.java | 2 +- .../methods/SetMailboxesDestructionProcessor.java | 2 +- .../jmap/draft/methods/SetMailboxesMethod.java | 2 +- .../draft/methods/SetMailboxesUpdateProcessor.java | 2 +- .../methods/SetMessagesCreationProcessor.java | 3 +- .../methods/SetMessagesDestructionProcessor.java | 2 +- .../jmap/draft/methods/SetMessagesMethod.java | 2 +- .../draft/methods/SetMessagesUpdateProcessor.java | 3 +- .../draft/methods/SetVacationResponseMethod.java | 2 +- .../draft/methods/UpdateMessagePatchConverter.java | 2 +- .../draft/methods/UpdateMessagePatchValidator.java | 2 +- .../org/apache/james/jmap/draft/model/BlobId.java | 4 - .../james/jmap/draft/model/MailboxFactory.java | 2 +- .../model/message/view/MessageFastViewFactory.java | 2 +- .../model/message/view/MessageFullViewFactory.java | 3 +- .../message/view/MessageHeaderViewFactory.java | 2 +- .../message/view/MessageMetadataViewFactory.java | 2 +- .../model/message/view/MetaMessageViewFactory.java | 2 +- .../apache/james/jmap/draft/send/MailSpool.java | 4 +- .../draft/send/PostDequeueDecoratorFactory.java | 2 +- .../james/jmap/draft/utils/MailboxUtils.java | 2 +- .../draft/utils/quotas/DefaultQuotaLoader.java | 2 +- .../ComputeMessageFastViewProjectionListener.java | 2 +- .../jmap/event/PopulateEmailQueryViewListener.java | 2 +- .../jmap/event/PropagateLookupRightListener.java | 2 +- .../http/AccessTokenAuthenticationStrategy.java | 2 +- .../james/jmap/http/AuthenticationRoutes.java | 4 +- .../jmap/http/DefaultMailboxesProvisioner.java | 2 +- .../org/apache/james/jmap/http/DownloadRoutes.java | 4 +- .../org/apache/james/jmap/http/JMAPApiRoutes.java | 4 +- ...ParameterAccessTokenAuthenticationStrategy.java | 2 +- .../org/apache/james/jmap/http/UploadRoutes.java | 4 +- .../apache/james/jmap/http/UserProvisioner.java | 2 +- .../mailet/ExtractMDNOriginalJMAPMessageId.java | 3 +- .../james/jmap/mailet/filter/ActionApplier.java | 3 +- .../james/jmap/mailet/filter/JMAPFiltering.java | 2 +- .../jmap/draft/methods/BlobManagerImplTest.java | 7 +- .../draft/methods/MIMEMessageConverterTest.java | 34 +++--- .../jmap/draft/methods/RequestHandlerTest.java | 2 +- .../message/view/MessageFastViewFactoryTest.java | 3 +- .../message/view/MessageFullViewFactoryTest.java | 8 +- .../message/view/MessageHeaderViewFactoryTest.java | 4 +- .../view/MessageMetadataViewFactoryTest.java | 4 +- ...mputeMessageFastViewProjectionListenerTest.java | 4 +- .../jmap/rfc8621/distributed/DistributedBase.java | 3 +- .../rfc8621/contract/CustomMethodContract.scala | 2 +- .../rfc8621/contract/EmailSetMethodContract.scala | 12 +- .../rfc8621/contract/IdentityGetContract.scala | 9 +- .../PushSubscriptionSetMethodContract.scala | 4 +- .../strategy/AllowAuthenticationStrategy.scala | 2 +- .../rfc8621/contract/probe/DelegationProbe.scala | 2 +- .../james/jmap/change/JmapEventSerializer.scala | 2 +- .../james/jmap/change/MailboxChangeListener.scala | 2 +- .../apache/james/jmap/core/SessionTranslator.scala | 2 +- .../jmap/http/BasicAuthenticationStrategy.scala | 2 +- .../james/jmap/http/MailboxesProvisioner.scala | 2 +- .../apache/james/jmap/http/UserProvisioning.scala | 2 +- .../james/jmap/json/EmailQuerySerializer.scala | 2 +- .../james/jmap/json/EmailSetSerializer.scala | 2 +- .../jmap/json/EmailSubmissionSetSerializer.scala | 2 +- .../org/apache/james/jmap/json/MDNSerializer.scala | 2 +- .../apache/james/jmap/json/MailboxSerializer.scala | 2 +- .../apache/james/jmap/json/PushSerializer.scala | 2 +- .../jmap/json/PushSubscriptionSerializer.scala | 2 +- .../scala/org/apache/james/jmap/mail/Email.scala | 8 +- .../apache/james/jmap/mail/MailboxFactory.scala | 2 +- .../james/jmap/method/DelegateGetMethod.scala | 2 +- .../jmap/method/DelegateSetCreatePerformer.scala | 2 +- .../jmap/method/DelegateSetDeletePerformer.scala | 2 +- .../james/jmap/method/DelegateSetMethod.scala | 2 +- .../method/DelegatedAccountDeletePerformer.scala | 2 +- .../jmap/method/DelegatedAccountGetMethod.scala | 2 +- .../jmap/method/DelegatedAccountSetMethod.scala | 2 +- .../james/jmap/method/EmailChangesMethod.scala | 2 +- .../apache/james/jmap/method/EmailGetMethod.scala | 2 +- .../james/jmap/method/EmailImportMethod.scala | 2 +- .../james/jmap/method/EmailParseMethod.scala | 2 +- .../james/jmap/method/EmailQueryMethod.scala | 2 +- .../jmap/method/EmailSetCreatePerformer.scala | 2 +- .../jmap/method/EmailSetDeletePerformer.scala | 2 +- .../apache/james/jmap/method/EmailSetMethod.scala | 2 +- .../jmap/method/EmailSetUpdatePerformer.scala | 2 +- .../jmap/method/EmailSubmissionSetMethod.scala | 4 +- .../james/jmap/method/IdentityChangesMethod.scala | 2 +- .../james/jmap/method/IdentityGetMethod.scala | 2 +- .../jmap/method/IdentitySetCreatePerformer.scala | 2 +- .../jmap/method/IdentitySetDeletePerformer.scala | 2 +- .../james/jmap/method/IdentitySetMethod.scala | 2 +- .../jmap/method/IdentitySetUpdatePerformer.scala | 2 +- .../apache/james/jmap/method/MDNParseMethod.scala | 2 +- .../apache/james/jmap/method/MDNSendMethod.scala | 4 +- .../james/jmap/method/MailboxChangesMethod.scala | 2 +- .../james/jmap/method/MailboxGetMethod.scala | 2 +- .../jmap/method/MailboxQueryChangesMethod.scala | 2 +- .../james/jmap/method/MailboxQueryMethod.scala | 2 +- .../jmap/method/MailboxSetCreatePerformer.scala | 2 +- .../jmap/method/MailboxSetDeletePerformer.scala | 2 +- .../james/jmap/method/MailboxSetMethod.scala | 2 +- .../jmap/method/MailboxSetUpdatePerformer.scala | 2 +- .../jmap/method/PushSubscriptionGetMethod.scala | 2 +- .../PushSubscriptionSetCreatePerformer.scala | 2 +- .../PushSubscriptionSetDeletePerformer.scala | 2 +- .../jmap/method/PushSubscriptionSetMethod.scala | 2 +- .../method/PushSubscriptionUpdatePerformer.scala | 2 +- .../james/jmap/method/QuotaChangesMethod.scala | 2 +- .../apache/james/jmap/method/QuotaGetMethod.scala | 2 +- .../james/jmap/method/QuotaQueryMethod.scala | 2 +- .../james/jmap/method/ThreadChangesMethod.scala | 2 +- .../apache/james/jmap/method/ThreadGetMethod.scala | 2 +- .../jmap/method/VacationResponseGetMethod.scala | 2 +- .../jmap/method/VacationResponseSetMethod.scala | 2 +- .../james/jmap/pushsubscription/PushListener.scala | 2 +- .../jmap/pushsubscription/WebPushClient.scala | 2 +- .../apache/james/jmap/routes/DownloadRoutes.scala | 10 +- .../james/jmap/routes/EventSourceRoutes.scala | 2 +- .../apache/james/jmap/routes/JMAPApiRoutes.scala | 2 +- .../org/apache/james/jmap/routes/JmapApi.scala | 2 +- .../apache/james/jmap/routes/SessionRoutes.scala | 2 +- .../apache/james/jmap/routes/SessionSupplier.scala | 2 +- .../apache/james/jmap/routes/UploadRoutes.scala | 2 +- .../apache/james/jmap/routes/WebSocketRoutes.scala | 2 +- .../quotas/QuotaLoaderWithPreloadedDefault.scala | 2 +- .../james/jmap/utils/quotas/QuotaReader.scala | 2 +- .../change/StateChangeEventSerializerTest.scala | 5 + server/protocols/jmap/pom.xml | 4 +- .../java/org/apache/james/jmap/JMAPServer.java | 4 +- .../java/org/apache/james/jmap/VersionParser.java | 2 +- .../james/jmap/http/JWTAuthenticationStrategy.java | 4 +- .../jmap/http/XUserAuthenticationStrategy.java | 2 +- server/protocols/jwt/pom.xml | 4 +- server/protocols/protocols-imap4/pom.xml | 4 +- .../james/imapserver/netty/IMAPServerFactory.java | 2 +- .../imapserver/netty/ImapRequestFrameDecoder.java | 11 +- .../james/imapserver/netty/IMAPServerTest.java | 47 +++++++- server/protocols/protocols-library/pom.xml | 8 +- .../lib/netty/AbstractConfigurableAsyncServer.java | 7 +- .../lib/netty/AbstractProtocolAsyncServer.java | 2 +- .../protocols/lib/netty/AbstractServerFactory.java | 4 +- .../lib/mock/MockProtocolHandlerLoader.java | 4 +- server/protocols/protocols-lmtp/pom.xml | 4 +- .../james/lmtpserver/MailetContainerHandler.java | 2 +- .../hook/MailboxDeliverToRecipientHandler.java | 4 +- .../james/lmtpserver/netty/LMTPServerFactory.java | 2 +- server/protocols/protocols-managesieve/pom.xml | 8 +- .../netty/ManageSieveServerFactory.java | 4 +- .../mailbox/CassandraPop3MetadataStore.java | 2 +- .../mailbox/DistributedMailboxAdapter.java | 4 +- .../mailbox/PopulateMetadataStoreListener.java | 2 +- .../task/MetaDataFixInconsistenciesService.java | 2 +- .../task/MetaDataFixInconsistenciesTask.java | 2 +- server/protocols/protocols-pop3/pom.xml | 4 +- .../james/pop3server/core/PassCmdHandler.java | 4 +- .../mailbox/DefaultMailboxAdapterFactory.java | 4 +- .../james/pop3server/netty/POP3ServerFactory.java | 2 +- server/protocols/protocols-smtp/pom.xml | 4 +- .../smtpserver/AuthRequiredToRelayRcptHook.java | 2 +- .../james/smtpserver/JamesDataCmdHandler.java | 2 +- .../james/smtpserver/JamesMailCmdHandler.java | 2 +- .../james/smtpserver/JamesRcptCmdHandler.java | 2 +- .../apache/james/smtpserver/SendMailHandler.java | 3 +- .../SenderAuthIdentifyVerificationHook.java | 2 +- .../james/smtpserver/UsersRepositoryAuthHook.java | 2 +- .../james/smtpserver/fastfail/DNSRBLHandler.java | 2 +- .../smtpserver/fastfail/JDBCGreylistHandler.java | 3 +- .../fastfail/ResolvableEhloHeloHandler.java | 2 +- .../fastfail/ReverseEqualsEhloHeloHandler.java | 2 +- .../james/smtpserver/fastfail/SPFHandler.java | 2 +- .../james/smtpserver/fastfail/SpamTrapHandler.java | 2 +- .../james/smtpserver/fastfail/URIRBLHandler.java | 3 +- .../smtpserver/fastfail/ValidRcptHandler.java | 2 +- .../james/smtpserver/fastfail/ValidRcptMX.java | 2 +- .../fastfail/ValidSenderDomainHandler.java | 2 +- .../futurerelease/FutureReleaseEHLOHook.java | 2 +- .../FutureReleaseMailParameterHook.java | 2 +- .../apache/james/smtpserver/netty/SMTPServer.java | 2 +- .../james/smtpserver/netty/SMTPServerFactory.java | 2 +- .../MemoryUsernameChangeIntegrationTest.java | 2 +- .../webadmin/routes/CassandraMappingsRoutes.java | 2 +- .../webadmin/service/CassandraMappingsService.java | 2 +- .../CassandraMappingsSolveInconsistenciesTask.java | 2 +- ...sandraMappingsSolveInconsistenciesTaskTest.java | 15 ++- .../protocols/webadmin/webadmin-cassandra/pom.xml | 4 +- .../routes/CassandraMailboxMergingRoutes.java | 2 +- .../webadmin/routes/CassandraMigrationRoutes.java | 2 +- .../RecomputeMailboxCountersRequestToTask.java | 2 +- .../SolveMailboxInconsistenciesRequestToTask.java | 2 +- .../SolveMessageInconsistenciesRequestToTask.java | 2 +- .../james/webadmin/routes/TasksCleanupRoutes.java | 2 +- .../webadmin/services/TasksCleanupService.java | 2 +- server/protocols/webadmin/webadmin-core/pom.xml | 8 +- .../org/apache/james/webadmin/WebAdminServer.java | 6 +- .../james/webadmin/authentication/JwtFilter.java | 4 +- .../james/webadmin/mdc/LoggingRequestFilter.java | 2 +- .../james/webadmin/routes/HealthCheckRoutes.java | 4 +- .../apache/james/webadmin/routes/TasksRoutes.java | 4 +- .../james/webadmin/utils/JsonTransformer.java | 2 +- .../webadmin/routes/HealthCheckRoutesTest.java | 4 +- server/protocols/webadmin/webadmin-data/pom.xml | 4 +- .../webadmin/routes/AddressMappingRoutes.java | 2 +- .../apache/james/webadmin/routes/AliasRoutes.java | 2 +- .../apache/james/webadmin/routes/BlobRoutes.java | 4 +- .../webadmin/routes/DLPConfigurationRoutes.java | 2 +- .../webadmin/routes/DeleteUserDataRoutes.java | 2 +- .../webadmin/routes/DomainMappingsRoutes.java | 2 +- .../james/webadmin/routes/DomainsRoutes.java | 2 +- .../james/webadmin/routes/ForwardRoutes.java | 2 +- .../apache/james/webadmin/routes/GroupsRoutes.java | 2 +- .../james/webadmin/routes/MappingRoutes.java | 2 +- .../james/webadmin/routes/RegexMappingRoutes.java | 2 +- .../james/webadmin/routes/SieveQuotaRoutes.java | 2 +- .../james/webadmin/routes/SieveScriptRoutes.java | 2 +- .../apache/james/webadmin/routes/UserRoutes.java | 2 +- .../webadmin/routes/UsernameChangeRoutes.java | 2 +- .../james/webadmin/routes/VacationRoutes.java | 2 +- .../webadmin/service/DeleteUserDataService.java | 2 +- .../james/webadmin/service/DomainAliasService.java | 2 +- .../apache/james/webadmin/service/UserService.java | 2 +- .../webadmin/service/UsernameChangeService.java | 2 +- .../james/webadmin/dropwizard/MetricsRoutes.java | 3 +- .../webadmin/webadmin-http-client/pom.xml | 5 - .../data/jmap/EmailQueryViewPopulator.java | 2 +- .../james/webadmin/data/jmap/JmapUploadRoutes.java | 2 +- .../jmap/MessageFastViewProjectionCorrector.java | 2 +- .../jmap/PopulateEmailQueryViewRequestToTask.java | 2 +- .../PopulateFilteringProjectionRequestToTask.java | 2 +- ...uteAllFastViewProjectionItemsRequestToTask.java | 2 +- ...teUserFastViewProjectionItemsRequestToTask.java | 2 +- .../webadmin/data/jmap/UserIdentityRoutes.java | 3 +- ...ctionItemsTaskAdditionalInformationDTOTest.java | 5 +- ...stViewProjectionItemsTaskSerializationTest.java | 4 +- ...ctionItemsTaskAdditionalInformationDTOTest.java | 4 +- ...stViewProjectionItemsTaskSerializationTest.java | 4 +- .../james/webadmin/routes/TransferEmailRoutes.java | 5 +- .../routes/DeletedMessagesVaultDeleteTask.java | 2 +- .../routes/DeletedMessagesVaultExportTaskDTO.java | 3 +- .../routes/DeletedMessagesVaultRestoreTaskDTO.java | 2 +- .../vault/routes/DeletedMessagesVaultRoutes.java | 3 +- .../james/webadmin/vault/routes/ExportService.java | 2 +- .../webadmin/vault/routes/RestoreService.java | 2 +- server/protocols/webadmin/webadmin-mailbox/pom.xml | 4 +- .../james/webadmin/routes/DomainQuotaRoutes.java | 2 +- .../webadmin/routes/EventDeadLettersRoutes.java | 2 +- .../james/webadmin/routes/GlobalQuotaRoutes.java | 2 +- .../james/webadmin/routes/MailboxesRoutes.java | 4 +- .../james/webadmin/routes/MessagesRoutes.java | 4 +- .../james/webadmin/routes/UserMailboxesRoutes.java | 4 +- .../james/webadmin/routes/UserQuotaRoutes.java | 4 +- .../service/CreateMissingParentsRequestToTask.java | 2 +- .../james/webadmin/service/DomainQuotaService.java | 2 +- .../service/EventDeadLettersRedeliverService.java | 2 +- .../webadmin/service/EventDeadLettersService.java | 2 +- .../webadmin/service/ExpireMailboxService.java | 2 +- .../james/webadmin/service/ExpireMailboxTask.java | 2 +- .../james/webadmin/service/ExportService.java | 2 +- .../james/webadmin/service/GlobalQuotaService.java | 2 +- .../service/MailboxesExportRequestToTask.java | 2 +- .../service/PreviousReIndexingService.java | 2 +- .../service/SubscribeAllRequestToTask.java | 2 +- .../webadmin/service/UserMailboxesService.java | 2 +- .../james/webadmin/service/UserQuotaService.java | 2 +- .../james/webadmin/routes/MailQueueRoutes.java | 2 +- .../webadmin/webadmin-mailrepository/pom.xml | 4 +- .../webadmin/routes/MailRepositoriesRoutes.java | 2 +- .../webadmin/service/ClearMailRepositoryTask.java | 2 +- .../service/MailRepositoryStoreService.java | 3 +- .../webadmin/service/ReprocessingService.java | 3 +- .../service/ReprocessingAllMailsTaskTest.java | 16 ++- .../service/ReprocessingOneMailTaskTest.java | 8 +- ...MetaDataFixInconsistenciesTaskRegistration.java | 2 +- .../protocols/webadmin/ProtocolServerRoutes.java | 2 +- .../routes/BrowseStartUpdateTaskRegistration.java | 2 +- .../webadmin/routes/RabbitMQMailQueuesRoutes.java | 4 +- server/queue/queue-activemq/pom.xml | 10 +- .../queue/activemq/ActiveMQCacheableMailQueue.java | 21 ++-- .../james/queue/activemq/ActiveMQHealthCheck.java | 8 +- .../queue/activemq/ActiveMQMailQueueFactory.java | 4 +- .../queue/activemq/ActiveMQMailQueueItem.java | 8 +- .../james/queue/activemq/EmbeddedActiveMQ.java | 6 +- .../queue/activemq/FileSystemBlobStrategy.java | 2 +- .../activemq/FileSystemBlobTransferPolicy.java | 2 +- .../activemq/MimeMessageBlobMessageSource.java | 2 +- .../metric/ActiveMQMetricCollectorImpl.java | 24 ++-- .../queue/activemq/metric/ActiveMQMetrics.java | 4 +- .../activemq/ActiveMQMailQueueFactoryTest.java | 2 +- .../metric/ActiveMQMetricCollectorTest.java | 2 +- server/queue/queue-jms/pom.xml | 10 +- .../james/queue/jms/JMSCacheableMailQueue.java | 23 ++-- .../james/queue/jms/JMSMailQueueFactory.java | 4 +- .../apache/james/queue/jms/JMSMailQueueItem.java | 6 +- .../queue/jms/MimeMessageObjectMessageSource.java | 5 +- .../queue/library/AbstractMailQueueFactory.java | 5 +- .../jms/JMSCacheableMailQueueFactoryTest.java | 2 +- server/queue/queue-memory/pom.xml | 8 +- .../james/queue/memory/MemoryMailQueueFactory.java | 5 +- server/queue/queue-pulsar/pom.xml | 8 +- .../queue/pulsar/PulsarMailQueueFactory.scala | 4 +- server/queue/queue-rabbitmq/pom.xml | 4 +- .../RabbitMQMailQueueConsumerHealthCheck.java | 2 +- ...abbitMQMailQueueDeadLetterQueueHealthCheck.java | 2 +- .../queue/rabbitmq/RabbitMQMailQueueFactory.java | 3 +- .../rabbitmq/RabbitMQMailQueueManagement.java | 2 +- .../rabbitmq/view/cassandra/BrowseStartDAO.java | 2 +- .../view/cassandra/BrowseStartHealthCheck.java | 2 +- .../view/cassandra/CassandraMailQueueBrowser.java | 3 +- .../cassandra/CassandraMailQueueMailDelete.java | 2 +- .../cassandra/CassandraMailQueueMailStore.java | 2 +- .../view/cassandra/CassandraMailQueueView.java | 3 +- .../CassandraMailQueueViewStartUpCheck.java | 2 +- .../rabbitmq/view/cassandra/ContentStartDAO.java | 2 +- .../rabbitmq/view/cassandra/DeletedMailsDAO.java | 2 +- .../rabbitmq/view/cassandra/EnqueuedMailsDAO.java | 2 +- .../MailQueueViewBlobReferenceSource.java | 2 +- .../EventsourcingConfigurationManagement.java | 2 +- .../DistributedTaskManagerHealthCheck.java | 2 +- .../distributed/RabbitMQTerminationSubscriber.java | 4 +- .../RabbitMQWorkQueueReconnectionHandler.java | 2 +- .../TerminationReconnectionHandler.java | 2 +- .../CassandraTaskExecutionDetailsProjection.scala | 2 +- ...assandraTaskExecutionDetailsProjectionDAO.scala | 2 +- .../distributed/RabbitMQWorkQueueSupplier.scala | 2 +- server/task/task-json/pom.xml | 4 +- .../JsonTaskAdditionalInformationSerializer.java | 4 +- .../james/server/task/json/JsonTaskSerializer.java | 4 +- server/task/task-memory/pom.xml | 4 +- .../org/apache/james/task/MemoryTaskManager.java | 4 +- .../eventsourcing/EventSourcingTaskManager.scala | 4 +- .../java/org/apache/james/util/docker/Images.java | 2 +- .../xdoc/server/config-spring-jpa-postgres.xml | 2 - src/site/xdoc/server/config-system.xml | 2 - src/site/xdoc/server/monitor-logging.xml | 1 - third-party/crowdsec/pom.xml | 4 +- .../apache/james/crowdsec/CrowdsecEhloHook.java | 2 +- .../crowdsec/CrowdsecImapConnectionCheck.java | 2 +- .../james/crowdsec/CrowdsecPOP3CheckHandler.java | 2 +- .../james/crowdsec/CrowdsecSMTPConnectHandler.java | 2 +- .../org/apache/james/crowdsec/CrowdsecService.java | 2 +- .../james/crowdsec/client/CrowdsecHttpClient.java | 2 +- .../apache/james/crowdsec/CrowdsecExtension.java | 2 +- third-party/elasticsearch/pom.xml | 8 +- .../james/metrics/es/v7/ESMetricReporter.java | 4 +- .../linshare/LinshareBlobExportMechanism.java | 2 +- .../org/apache/james/rspamd/RspamdListener.java | 2 +- .../org/apache/james/rspamd/RspamdScanner.java | 3 +- .../james/rspamd/client/RspamdHttpClient.java | 3 +- .../rspamd/healthcheck/RspamdHealthCheck.java | 2 +- .../james/rspamd/route/FeedMessageRoute.java | 2 +- .../apache/james/spamassassin/SpamAssassin.java | 3 +- .../james/spamassassin/SpamAssassinHandler.java | 3 +- .../james/spamassassin/SpamAssassinLearner.java | 2 +- .../james/spamassassin/SpamAssassinListener.java | 2 +- .../james/spamassassin/SpamAssassinModule.java | 2 +- .../module/SpamAssassinTestModule.java | 2 +- 1185 files changed, 2553 insertions(+), 3425 deletions(-) copy mailet/api/src/main/java/org/apache/mailet/Experimental.java => mailbox/api/src/main/java/org/apache/james/mailbox/AttachmentIdFactory.java (86%) copy mpt/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java => mailbox/api/src/main/java/org/apache/james/mailbox/StringBackedAttachmentIdFactory.java (76%) copy mailbox/api/src/main/java/org/apache/james/mailbox/model/{AttachmentId.java => StringBackedAttachmentId.java} (81%) rename mailbox/api/src/test/java/org/apache/james/mailbox/model/{AttachmentIdTest.java => StringBackedAttachmentIdTest.java} (77%) delete mode 100644 server/apps/spring-app/src/main/resources/jetm-monitoring.xml delete mode 100644 server/container/guice/mailet/src/test/resources/recursive/extensions-jars/custom-mailets-implementation-3.5.0-SNAPSHOT.jar create mode 100644 server/container/guice/mailet/src/test/resources/recursive/extensions-jars/custom-mailets-implementation-3.9.0-SNAPSHOT.jar rename server/container/guice/mailet/src/test/resources/recursive/extensions-jars/{james-server-guice-custom-mailets-3.5.0-SNAPSHOT-jar-with-dependencies.jar => james-server-guice-custom-mailets-3.9.0-SNAPSHOT-jar-with-dependencies.jar} (58%) copy mailbox/plugin/deleted-messages-vault-cassandra/src/main/java/org/apache/james/vault/metadata/DeletedMessageIdentifier.java => server/container/spring/src/main/java/org/apache/james/container/spring/rmi/RmiRegistryFactoryBean.java (58%) delete mode 100644 server/protocols/jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadCucumberTest.java copy server/protocols/{jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MessagePropertyTest.java => jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadEnpointCucumberTest.java} (62%) copy server/protocols/{jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MessagePropertyTest.java => jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadGetCucumberTest.java} (63%) copy server/protocols/{jmap-draft/src/test/java/org/apache/james/jmap/draft/model/MessagePropertyTest.java => jmap-draft-integration-testing/memory-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/memory/cucumber/MemoryDownloadPostCucumberTest.java} (63%) delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberAwsS3Singleton.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberCassandraSingleton.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberOpenSearchSingleton.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/CucumberRabbitMQSingleton.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQAwsS3Stepdefs.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQDownloadCucumberTest.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQGetMessagesMethodTest.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQIMAPKeywordsInconsistenciesTest.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQIMAPSetMessagesCompatibilityTest.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQMailboxSharingTest.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQMessageSharingTest.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQSetMailboxesMethodCucumberTest.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQSetMessagesMethodCucumberTest.java delete mode 100644 server/protocols/jmap-draft-integration-testing/rabbitmq-jmap-draft-integration-testing/src/test/java/org/apache/james/jmap/rabbitmq/cucumber/awss3/RabbitMQUploadCucumberTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org For additional commands, e-mail: notifications-h...@james.apache.org