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 648b218a7d97d809229d57f442888b05b2b8fbdb Author: Rene Cordier <[email protected]> AuthorDate: Wed Mar 20 14:31:53 2024 +0700 JAMES-2586 Fix Postgres build after rebase on master --- mailbox/postgres/pom.xml | 10 ++++++++-- .../james/mailbox/postgres/PostgresMessageManager.java | 2 +- .../mailbox/postgres/mail/PostgresMessageIdMapper.java | 2 +- .../mailbox/postgres/mail/PostgresMessageMapper.java | 2 +- .../postgres/mail/dao/PostgresMailboxMessageDAO.java | 3 ++- .../mail/dao/PostgresMailboxMessageDAOUtils.java | 2 +- .../mailbox/postgres/search/DeletedSearchOverride.java | 3 ++- .../postgres/search/DeletedWithRangeSearchOverride.java | 3 ++- .../search/NotDeletedWithRangeSearchOverride.java | 3 ++- .../mailbox/postgres/search/UnseenSearchOverride.java | 3 ++- .../mail/PostgresMessageBlobReferenceSourceTest.java | 2 +- .../mail/PostgresMessageMapperRowLevelSecurityTest.java | 2 +- .../mailbox/postgres/search/AllSearchOverrideTest.java | 2 +- .../postgres/search/DeletedSearchOverrideTest.java | 6 +++--- .../search/DeletedWithRangeSearchOverrideTest.java | 6 +++--- .../search/NotDeletedWithRangeSearchOverrideTest.java | 4 ++-- .../mailbox/postgres/search/SearchOverrideFixture.java | 2 +- .../mailbox/postgres/search/UidSearchOverrideTest.java | 2 +- .../postgres/search/UnseenSearchOverrideTest.java | 4 ++-- .../cassandra/upload/CassandraUploadRepositoryTest.java | 12 ------------ .../postgres/identity/PostgresCustomIdentityDAO.java | 4 ++-- .../jmap/api/upload/UploadRepositoryContract.scala | 15 +-------------- server/data/data-postgres/pom.xml | 7 ++++++- .../mailrepository/postgres/PostgresMailRepository.java | 3 ++- .../postgres/PostgresMailRepositoryContentDAO.java | 5 +++-- .../PostgresMailRepositoryBlobReferenceSourceTest.java | 2 +- .../org/apache/james/rrt/postgres/PostgresStepdefs.java | 4 ++-- .../apache/james/rrt/postgres/RewriteTablesTest.java | 17 +++++++++-------- .../PostgresWebAdminServerBlobGCIntegrationTest.java | 4 ++-- 29 files changed, 65 insertions(+), 71 deletions(-) diff --git a/mailbox/postgres/pom.xml b/mailbox/postgres/pom.xml index 925acd4052..628e995e3d 100644 --- a/mailbox/postgres/pom.xml +++ b/mailbox/postgres/pom.xml @@ -110,6 +110,12 @@ <artifactId>event-bus-in-vm</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>${james.groupId}</groupId> + <artifactId>james-json</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>${james.groupId}</groupId> <artifactId>james-server-data-postgres</artifactId> @@ -150,8 +156,8 @@ <version>${uuid-creator.version}</version> </dependency> <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>javax.mail</artifactId> + <groupId>org.eclipse.angus</groupId> + <artifactId>jakarta.mail</artifactId> </dependency> <dependency> <groupId>org.jasypt</groupId> diff --git a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/PostgresMessageManager.java b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/PostgresMessageManager.java index 282017bb86..ad2621b4aa 100644 --- a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/PostgresMessageManager.java +++ b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/PostgresMessageManager.java @@ -24,7 +24,7 @@ import java.util.EnumSet; import java.util.List; import java.util.Optional; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.james.events.EventBus; import org.apache.james.mailbox.MailboxPathLocker; diff --git a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageIdMapper.java b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageIdMapper.java index 695c066da0..e9df32ae4a 100644 --- a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageIdMapper.java +++ b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageIdMapper.java @@ -33,7 +33,7 @@ import java.util.Date; import java.util.List; import java.util.function.Function; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.commons.lang3.tuple.Pair; import org.apache.james.backends.postgres.utils.PostgresUtils; diff --git a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageMapper.java b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageMapper.java index 9fc948a2bf..324c244a38 100644 --- a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageMapper.java +++ b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/PostgresMessageMapper.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.commons.lang3.tuple.Pair; import org.apache.james.backends.postgres.utils.PostgresExecutor; diff --git a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/dao/PostgresMailboxMessageDAO.java b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/dao/PostgresMailboxMessageDAO.java index 544154b5bb..b1a403012d 100644 --- a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/dao/PostgresMailboxMessageDAO.java +++ b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/mail/dao/PostgresMailboxMessageDAO.java @@ -57,7 +57,8 @@ import java.util.function.Function; import javax.inject.Inject; import javax.inject.Singleton; -import javax.mail.Flags; + +import jakarta.mail.Flags; import org.apache.commons.lang3.tuple.Pair; import org.apache.james.backends.postgres.utils.PostgresExecutor; 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 65404964a4..0649ddb686 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 @@ -53,7 +53,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.ModSeq; diff --git a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/DeletedSearchOverride.java b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/DeletedSearchOverride.java index 87a4d68ddb..e5354c2887 100644 --- a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/DeletedSearchOverride.java +++ b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/DeletedSearchOverride.java @@ -20,7 +20,8 @@ package org.apache.james.mailbox.postgres.search; import javax.inject.Inject; -import javax.mail.Flags; + +import jakarta.mail.Flags; import org.apache.james.backends.postgres.utils.PostgresExecutor; import org.apache.james.mailbox.MailboxSession; diff --git a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/DeletedWithRangeSearchOverride.java b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/DeletedWithRangeSearchOverride.java index 853abc695d..ac18e038ed 100644 --- a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/DeletedWithRangeSearchOverride.java +++ b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/DeletedWithRangeSearchOverride.java @@ -20,7 +20,8 @@ package org.apache.james.mailbox.postgres.search; import javax.inject.Inject; -import javax.mail.Flags; + +import jakarta.mail.Flags; import org.apache.james.backends.postgres.utils.PostgresExecutor; import org.apache.james.mailbox.MailboxSession; diff --git a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/NotDeletedWithRangeSearchOverride.java b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/NotDeletedWithRangeSearchOverride.java index d604e3681c..18cd8259b9 100644 --- a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/NotDeletedWithRangeSearchOverride.java +++ b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/NotDeletedWithRangeSearchOverride.java @@ -20,7 +20,8 @@ package org.apache.james.mailbox.postgres.search; import javax.inject.Inject; -import javax.mail.Flags; + +import jakarta.mail.Flags; import org.apache.james.backends.postgres.utils.PostgresExecutor; import org.apache.james.mailbox.MailboxSession; diff --git a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/UnseenSearchOverride.java b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/UnseenSearchOverride.java index d269439d84..ede176dfd7 100644 --- a/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/UnseenSearchOverride.java +++ b/mailbox/postgres/src/main/java/org/apache/james/mailbox/postgres/search/UnseenSearchOverride.java @@ -23,7 +23,8 @@ package org.apache.james.mailbox.postgres.search; import java.util.Optional; import javax.inject.Inject; -import javax.mail.Flags; + +import jakarta.mail.Flags; import org.apache.james.backends.postgres.utils.PostgresExecutor; import org.apache.james.mailbox.MailboxSession; diff --git a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/mail/PostgresMessageBlobReferenceSourceTest.java b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/mail/PostgresMessageBlobReferenceSourceTest.java index 56de642dd5..0fe245c667 100644 --- a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/mail/PostgresMessageBlobReferenceSourceTest.java +++ b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/mail/PostgresMessageBlobReferenceSourceTest.java @@ -25,7 +25,7 @@ import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.UUID; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.james.backends.postgres.PostgresExtension; import org.apache.james.blob.api.HashBlobId; diff --git a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/mail/PostgresMessageMapperRowLevelSecurityTest.java b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/mail/PostgresMessageMapperRowLevelSecurityTest.java index 87ba69c637..43601491e0 100644 --- a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/mail/PostgresMessageMapperRowLevelSecurityTest.java +++ b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/mail/PostgresMessageMapperRowLevelSecurityTest.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.time.Instant; import java.util.Date; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.james.backends.postgres.PostgresExtension; import org.apache.james.backends.postgres.utils.DomainImplPostgresConnectionFactory; diff --git a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/AllSearchOverrideTest.java b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/AllSearchOverrideTest.java index 04fdbfbd3a..ed9aafdce9 100644 --- a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/AllSearchOverrideTest.java +++ b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/AllSearchOverrideTest.java @@ -24,7 +24,7 @@ import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAI import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAILBOX_SESSION; import static org.assertj.core.api.Assertions.assertThat; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.james.backends.postgres.PostgresExtension; import org.apache.james.blob.api.HashBlobId; diff --git a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/DeletedSearchOverrideTest.java b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/DeletedSearchOverrideTest.java index 82cb2f17ab..42471bf5c2 100644 --- a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/DeletedSearchOverrideTest.java +++ b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/DeletedSearchOverrideTest.java @@ -19,14 +19,14 @@ package org.apache.james.mailbox.postgres.search; -import static javax.mail.Flags.Flag.DELETED; -import static javax.mail.Flags.Flag.SEEN; +import static jakarta.mail.Flags.Flag.DELETED; +import static jakarta.mail.Flags.Flag.SEEN; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.BLOB_ID; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAILBOX; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAILBOX_SESSION; import static org.assertj.core.api.Assertions.assertThat; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.james.backends.postgres.PostgresExtension; import org.apache.james.blob.api.HashBlobId; diff --git a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/DeletedWithRangeSearchOverrideTest.java b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/DeletedWithRangeSearchOverrideTest.java index a7dc79eee1..7f7b05307a 100644 --- a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/DeletedWithRangeSearchOverrideTest.java +++ b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/DeletedWithRangeSearchOverrideTest.java @@ -19,14 +19,14 @@ package org.apache.james.mailbox.postgres.search; -import static javax.mail.Flags.Flag.DELETED; -import static javax.mail.Flags.Flag.SEEN; +import static jakarta.mail.Flags.Flag.DELETED; +import static jakarta.mail.Flags.Flag.SEEN; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.BLOB_ID; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAILBOX; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAILBOX_SESSION; import static org.assertj.core.api.Assertions.assertThat; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.james.backends.postgres.PostgresExtension; import org.apache.james.blob.api.HashBlobId; diff --git a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/NotDeletedWithRangeSearchOverrideTest.java b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/NotDeletedWithRangeSearchOverrideTest.java index 7c8fdab246..351f79da52 100644 --- a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/NotDeletedWithRangeSearchOverrideTest.java +++ b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/NotDeletedWithRangeSearchOverrideTest.java @@ -19,13 +19,13 @@ package org.apache.james.mailbox.postgres.search; -import static javax.mail.Flags.Flag.DELETED; +import static jakarta.mail.Flags.Flag.DELETED; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.BLOB_ID; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAILBOX; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAILBOX_SESSION; import static org.assertj.core.api.Assertions.assertThat; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.james.backends.postgres.PostgresExtension; import org.apache.james.blob.api.HashBlobId; diff --git a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/SearchOverrideFixture.java b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/SearchOverrideFixture.java index b64043d7b3..41f8e957df 100644 --- a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/SearchOverrideFixture.java +++ b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/SearchOverrideFixture.java @@ -23,7 +23,7 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Date; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.james.core.Username; import org.apache.james.mailbox.MailboxSession; diff --git a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/UidSearchOverrideTest.java b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/UidSearchOverrideTest.java index 45237068a8..10bd7190b9 100644 --- a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/UidSearchOverrideTest.java +++ b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/UidSearchOverrideTest.java @@ -24,7 +24,7 @@ import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAI import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAILBOX_SESSION; import static org.assertj.core.api.Assertions.assertThat; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.james.backends.postgres.PostgresExtension; import org.apache.james.blob.api.HashBlobId; diff --git a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/UnseenSearchOverrideTest.java b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/UnseenSearchOverrideTest.java index b6d6411626..7b78e7253c 100644 --- a/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/UnseenSearchOverrideTest.java +++ b/mailbox/postgres/src/test/java/org/apache/james/mailbox/postgres/search/UnseenSearchOverrideTest.java @@ -19,13 +19,13 @@ package org.apache.james.mailbox.postgres.search; -import static javax.mail.Flags.Flag.SEEN; +import static jakarta.mail.Flags.Flag.SEEN; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.BLOB_ID; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAILBOX; import static org.apache.james.mailbox.postgres.search.SearchOverrideFixture.MAILBOX_SESSION; import static org.assertj.core.api.Assertions.assertThat; -import javax.mail.Flags; +import jakarta.mail.Flags; import org.apache.james.backends.postgres.PostgresExtension; import org.apache.james.blob.api.HashBlobId; diff --git a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadRepositoryTest.java b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadRepositoryTest.java index e9e926bb57..75366d43f2 100644 --- a/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadRepositoryTest.java +++ b/server/data/data-jmap-cassandra/src/test/java/org/apache/james/jmap/cassandra/upload/CassandraUploadRepositoryTest.java @@ -76,16 +76,4 @@ class CassandraUploadRepositoryTest implements UploadRepositoryContract { public UpdatableTickingClock clock() { return clock; } - - @Disabled("Delete method always return true (to avoid LWT)") - @Override - public void deleteShouldReturnTrueWhenRowExists() { - UploadRepositoryContract.super.deleteShouldReturnTrueWhenRowExists(); - } - - @Disabled("Delete method always return true (to avoid LWT)") - @Override - public void deleteShouldReturnFalseWhenRowDoesNotExist() { - UploadRepositoryContract.super.deleteShouldReturnFalseWhenRowDoesNotExist(); - } } \ No newline at end of file diff --git a/server/data/data-jmap-postgres/src/main/java/org/apache/james/jmap/postgres/identity/PostgresCustomIdentityDAO.java b/server/data/data-jmap-postgres/src/main/java/org/apache/james/jmap/postgres/identity/PostgresCustomIdentityDAO.java index b1b7fed98e..be24e724d2 100644 --- a/server/data/data-jmap-postgres/src/main/java/org/apache/james/jmap/postgres/identity/PostgresCustomIdentityDAO.java +++ b/server/data/data-jmap-postgres/src/main/java/org/apache/james/jmap/postgres/identity/PostgresCustomIdentityDAO.java @@ -62,7 +62,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scala.publisher.SMono; import scala.Option; -import scala.collection.immutable.Seq; +import scala.collection.immutable.Set; import scala.jdk.javaapi.CollectionConverters; import scala.jdk.javaapi.OptionConverters; import scala.runtime.BoxedUnit; @@ -166,7 +166,7 @@ public class PostgresCustomIdentityDAO implements CustomIdentityDAO { } @Override - public Publisher<BoxedUnit> delete(Username username, Seq<IdentityId> ids) { + public Publisher<BoxedUnit> delete(Username username, Set<IdentityId> ids) { if (ids.isEmpty()) { return Mono.empty(); } diff --git a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/upload/UploadRepositoryContract.scala b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/upload/UploadRepositoryContract.scala index cce5999873..f544408968 100644 --- a/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/upload/UploadRepositoryContract.scala +++ b/server/data/data-jmap/src/test/java/org/apache/james/jmap/api/upload/UploadRepositoryContract.scala @@ -205,6 +205,7 @@ assertThat(SMono.fromPublisher(testee.delete(uploadIdOfAlice, Username.of("Bob"))).block()).isFalse } + @Test def deleteByUploadDateBeforeShouldRemoveExpiredUploads(): Unit = { val uploadId1: UploadId = SMono.fromPublisher(testee.upload(data(), CONTENT_TYPE, USER)).block().uploadId clock.setInstant(clock.instant().plus(8, java.time.temporal.ChronoUnit.DAYS)) @@ -217,18 +218,4 @@ assertThat(SMono.fromPublisher(testee.retrieve(uploadId2, USER)).block()) .isNotNull } - - @Test - def deleteShouldReturnTrueWhenRowExists(): Unit = { - val uploadId: UploadId = SMono.fromPublisher(testee.upload(data(), CONTENT_TYPE, USER)).block().uploadId - - assertThat(SMono.fromPublisher(testee.delete(uploadId, USER)).block()).isTrue - } - - @Test - def deleteShouldReturnFalseWhenRowDoesNotExist(): Unit = { - val uploadIdOfAlice: UploadId = SMono.fromPublisher(testee.upload(data(), CONTENT_TYPE, Username.of("Alice"))).block().uploadId - assertThat(SMono.fromPublisher(testee.delete(uploadIdOfAlice, Username.of("Bob"))).block()).isFalse - } - } diff --git a/server/data/data-postgres/pom.xml b/server/data/data-postgres/pom.xml index d12ba78633..be37637253 100644 --- a/server/data/data-postgres/pom.xml +++ b/server/data/data-postgres/pom.xml @@ -111,7 +111,7 @@ </dependency> <dependency> <groupId>io.cucumber</groupId> - <artifactId>cucumber-junit</artifactId> + <artifactId>cucumber-junit-platform-engine</artifactId> <scope>test</scope> </dependency> <dependency> @@ -123,6 +123,11 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-configuration2</artifactId> </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-suite</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> diff --git a/server/data/data-postgres/src/main/java/org/apache/james/mailrepository/postgres/PostgresMailRepository.java b/server/data/data-postgres/src/main/java/org/apache/james/mailrepository/postgres/PostgresMailRepository.java index 1f9da8f4c7..0be6645409 100644 --- a/server/data/data-postgres/src/main/java/org/apache/james/mailrepository/postgres/PostgresMailRepository.java +++ b/server/data/data-postgres/src/main/java/org/apache/james/mailrepository/postgres/PostgresMailRepository.java @@ -23,7 +23,8 @@ import java.util.Collection; import java.util.Iterator; import javax.inject.Inject; -import javax.mail.MessagingException; + +import jakarta.mail.MessagingException; import org.apache.james.mailrepository.api.MailKey; import org.apache.james.mailrepository.api.MailRepository; diff --git a/server/data/data-postgres/src/main/java/org/apache/james/mailrepository/postgres/PostgresMailRepositoryContentDAO.java b/server/data/data-postgres/src/main/java/org/apache/james/mailrepository/postgres/PostgresMailRepositoryContentDAO.java index 2a52d4cb60..91232051c3 100644 --- a/server/data/data-postgres/src/main/java/org/apache/james/mailrepository/postgres/PostgresMailRepositoryContentDAO.java +++ b/server/data/data-postgres/src/main/java/org/apache/james/mailrepository/postgres/PostgresMailRepositoryContentDAO.java @@ -49,8 +49,9 @@ import java.util.function.Consumer; import java.util.stream.Stream; import javax.inject.Inject; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; + +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/server/data/data-postgres/src/test/java/org/apache/james/mailrepository/postgres/PostgresMailRepositoryBlobReferenceSourceTest.java b/server/data/data-postgres/src/test/java/org/apache/james/mailrepository/postgres/PostgresMailRepositoryBlobReferenceSourceTest.java index 93b6fa513a..7d33edb9a5 100644 --- a/server/data/data-postgres/src/test/java/org/apache/james/mailrepository/postgres/PostgresMailRepositoryBlobReferenceSourceTest.java +++ b/server/data/data-postgres/src/test/java/org/apache/james/mailrepository/postgres/PostgresMailRepositoryBlobReferenceSourceTest.java @@ -21,7 +21,7 @@ package org.apache.james.mailrepository.postgres; import static org.assertj.core.api.Assertions.assertThat; -import javax.mail.MessagingException; +import jakarta.mail.MessagingException; import org.apache.james.backends.postgres.PostgresExtension; import org.apache.james.backends.postgres.PostgresModule; diff --git a/server/data/data-postgres/src/test/java/org/apache/james/rrt/postgres/PostgresStepdefs.java b/server/data/data-postgres/src/test/java/org/apache/james/rrt/postgres/PostgresStepdefs.java index dc89ddf929..f3da4c21bd 100644 --- a/server/data/data-postgres/src/test/java/org/apache/james/rrt/postgres/PostgresStepdefs.java +++ b/server/data/data-postgres/src/test/java/org/apache/james/rrt/postgres/PostgresStepdefs.java @@ -31,8 +31,8 @@ import org.apache.james.user.postgres.PostgresUsersRepositoryConfiguration; import com.github.fge.lambdas.Throwing; -import cucumber.api.java.After; -import cucumber.api.java.Before; +import io.cucumber.java.After; +import io.cucumber.java.Before; public class PostgresStepdefs { static PostgresExtension postgresExtension = PostgresExtension.withoutRowLevelSecurity(PostgresModule.aggregateModules(PostgresRecipientRewriteTableModule.MODULE, PostgresUserModule.MODULE)); diff --git a/server/data/data-postgres/src/test/java/org/apache/james/rrt/postgres/RewriteTablesTest.java b/server/data/data-postgres/src/test/java/org/apache/james/rrt/postgres/RewriteTablesTest.java index 4d0077187c..ee1e00e3f5 100644 --- a/server/data/data-postgres/src/test/java/org/apache/james/rrt/postgres/RewriteTablesTest.java +++ b/server/data/data-postgres/src/test/java/org/apache/james/rrt/postgres/RewriteTablesTest.java @@ -18,15 +18,16 @@ ****************************************************************/ package org.apache.james.rrt.postgres; -import org.junit.runner.RunWith; +import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME; -import cucumber.api.CucumberOptions; -import cucumber.api.junit.Cucumber; +import org.junit.platform.suite.api.ConfigurationParameter; +import org.junit.platform.suite.api.IncludeEngines; +import org.junit.platform.suite.api.SelectClasspathResource; +import org.junit.platform.suite.api.Suite; -@RunWith(Cucumber.class) -@CucumberOptions( - features = { "classpath:cucumber/" }, - glue = { "org.apache.james.rrt.lib", "org.apache.james.rrt.postgres" } - ) +@Suite +@IncludeEngines("cucumber") +@SelectClasspathResource("cucumber") +@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.apache.james.rrt.lib,org.apache.james.rrt.postgres") public class RewriteTablesTest { } diff --git a/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/postgres/PostgresWebAdminServerBlobGCIntegrationTest.java b/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/postgres/PostgresWebAdminServerBlobGCIntegrationTest.java index 7346805bbe..94c7de66f5 100644 --- a/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/postgres/PostgresWebAdminServerBlobGCIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/postgres-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/postgres/PostgresWebAdminServerBlobGCIntegrationTest.java @@ -28,8 +28,8 @@ import java.time.Clock; import java.time.ZonedDateTime; import java.util.Date; -import javax.mail.Flags; -import javax.mail.util.SharedByteArrayInputStream; +import jakarta.mail.Flags; +import jakarta.mail.util.SharedByteArrayInputStream; import org.apache.james.GuiceJamesServer; import org.apache.james.GuiceModuleTestExtension; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
