This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e8ab7b128ad3369c406095b1c6800f27560b3e2c Author: Tung Tran <[email protected]> AuthorDate: Fri Apr 5 13:28:13 2024 +0700 JAMES-4025 Relocate JMAP MessageIdProbe, JmapGuiceProbe, JMAPModule --- .../java/org/apache/james/CassandraJamesServerConfiguration.java | 2 +- .../test/java/org/apache/james/JamesCapabilitiesServerTest.java | 2 +- .../org/apache/james/CassandraRabbitMQJamesConfiguration.java | 2 +- .../src/main/java/org/apache/james/MemoryJamesConfiguration.java | 2 +- .../main/java/org/apache/james/jmap/{draft => }/JMAPModule.java | 8 ++++---- .../java/org/apache/james/jmap/{draft => }/JmapGuiceProbe.java | 3 +-- .../java/org/apache/james/jmap/{draft => }/MessageIdProbe.java | 2 +- .../java/org/apache/james/modules/protocols/JMAPServerModule.java | 6 +++--- .../src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java | 2 +- .../java/org/apache/james/jmap/draft/JmapJamesServerContract.java | 1 + .../java/org/apache/james/jmap/draft/MailetPreconditionTest.java | 1 + .../james/transport/mailets/RequeueThrottlingIntegrationTest.java | 2 +- .../test/java/org/apache/james/jmap/JMAPAuthenticationTest.java | 2 +- .../src/test/java/org/apache/james/jmap/JmapURIBuilder.java | 2 +- .../james/jmap/ModularizeJmapDraftAuthenticationStrategyTest.java | 2 +- .../src/test/java/org/apache/james/jmap/ProvisioningTest.java | 2 +- .../test/java/org/apache/james/jmap/VacationIntegrationTest.java | 2 +- .../java/org/apache/james/jmap/VacationRelayIntegrationTest.java | 2 +- .../james/jmap/draft/methods/integration/CorsHeaderAPITest.java | 2 +- .../apache/james/jmap/draft/methods/integration/FilterTest.java | 2 +- .../jmap/draft/methods/integration/GetMailboxesMethodTest.java | 2 +- .../jmap/draft/methods/integration/GetMessageListMethodTest.java | 2 +- .../jmap/draft/methods/integration/GetVacationResponseTest.java | 2 +- .../james/jmap/draft/methods/integration/QuotaMailingTest.java | 2 +- .../james/jmap/draft/methods/integration/SendMDNMethodTest.java | 2 +- .../jmap/draft/methods/integration/SetMailboxesMethodTest.java | 2 +- .../draft/methods/integration/SetMessagesMethodReRoutingTest.java | 2 +- .../jmap/draft/methods/integration/SetMessagesMethodTest.java | 4 ++-- .../methods/integration/SetMessagesOutboxFlagUpdateTest.java | 2 +- .../jmap/draft/methods/integration/SetVacationResponseTest.java | 2 +- .../methods/integration/cucumber/GetMessagesMethodStepdefs.java | 2 +- .../jmap/draft/methods/integration/cucumber/MainStepdefs.java | 2 +- .../org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java | 2 +- .../apache/james/jmap/rfc8621/contract/CustomMethodContract.scala | 5 +---- .../james/jmap/rfc8621/contract/EmailChangesMethodContract.scala | 2 +- .../james/jmap/rfc8621/contract/EmailGetMethodContract.scala | 2 +- .../james/jmap/rfc8621/contract/EmailSetMethodContract.scala | 4 ++-- .../apache/james/jmap/rfc8621/contract/EventSourceContract.scala | 2 +- .../scala/org/apache/james/jmap/rfc8621/contract/Fixture.scala | 2 +- .../james/jmap/rfc8621/contract/MDNSendMethodContract.scala | 2 +- .../jmap/rfc8621/contract/MailboxChangesMethodContract.scala | 2 +- .../james/jmap/rfc8621/contract/MailboxSetMethodContract.scala | 2 +- .../james/jmap/rfc8621/contract/SessionRoutesContract.scala | 2 +- .../jmap/rfc8621/contract/VacationResponseGetMethodContract.scala | 2 +- .../apache/james/jmap/rfc8621/contract/WebSocketContract.scala | 2 +- .../ModularizeJmapRFC8621AuthenticationStrategyContract.java | 2 +- .../webadmin/integration/rabbitmq/FixingGhostMailboxTest.java | 2 +- .../rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java | 2 +- .../integration/memory/MemoryUserDeletionIntegrationTest.java | 4 +--- .../integration/memory/MemoryUsernameChangeIntegrationTest.java | 2 +- .../FastViewProjectionHealthCheckIntegrationContract.java | 2 +- .../apache/james/webadmin/integration/ForwardIntegrationTest.java | 2 +- .../james/webadmin/integration/QuotaSearchIntegrationTest.java | 2 +- .../integration/vault/DeletedMessageVaultIntegrationTest.java | 2 +- .../vault/LinshareBlobExportMechanismIntegrationTest.java | 2 +- .../java/org/apache/james/spamassassin/SpamAssassinContract.java | 3 +-- 56 files changed, 63 insertions(+), 68 deletions(-) diff --git a/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java b/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java index b731768490..6a9006abf5 100644 --- a/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java +++ b/server/apps/cassandra-app/src/main/java/org/apache/james/CassandraJamesServerConfiguration.java @@ -27,7 +27,7 @@ import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.data.UsersRepositoryModuleChooser; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.filesystem.api.JamesDirectoriesProvider; -import org.apache.james.jmap.draft.JMAPModule; +import org.apache.james.jmap.JMAPModule; import org.apache.james.server.core.JamesServerResourceLoader; import org.apache.james.server.core.MissingArgumentException; import org.apache.james.server.core.configuration.Configuration; diff --git a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java index 20b41d3142..a784e72304 100644 --- a/server/apps/cassandra-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java +++ b/server/apps/cassandra-app/src/test/java/org/apache/james/JamesCapabilitiesServerTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.when; import java.util.EnumSet; -import org.apache.james.jmap.draft.JMAPModule; +import org.apache.james.jmap.JMAPModule; import org.apache.james.mailbox.MailboxManager; import org.apache.james.modules.TestJMAPServerModule; import org.junit.jupiter.api.Test; diff --git a/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java index 7a4daa5d67..eb4bbce297 100644 --- a/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java +++ b/server/apps/distributed-app/src/main/java/org/apache/james/CassandraRabbitMQJamesConfiguration.java @@ -27,7 +27,7 @@ import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.data.UsersRepositoryModuleChooser; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.filesystem.api.JamesDirectoriesProvider; -import org.apache.james.jmap.draft.JMAPModule; +import org.apache.james.jmap.JMAPModule; import org.apache.james.modules.blobstore.BlobStoreConfiguration; import org.apache.james.modules.queue.rabbitmq.MailQueueViewChoice; import org.apache.james.server.core.JamesServerResourceLoader; diff --git a/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesConfiguration.java b/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesConfiguration.java index d186b9504d..88bfff39a3 100644 --- a/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesConfiguration.java +++ b/server/apps/memory-app/src/main/java/org/apache/james/MemoryJamesConfiguration.java @@ -27,7 +27,7 @@ import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.data.UsersRepositoryModuleChooser; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.filesystem.api.JamesDirectoriesProvider; -import org.apache.james.jmap.draft.JMAPModule; +import org.apache.james.jmap.JMAPModule; import org.apache.james.server.core.JamesServerResourceLoader; import org.apache.james.server.core.MissingArgumentException; import org.apache.james.server.core.configuration.Configuration; diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java similarity index 98% rename from server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java rename to server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java index 9b5fefba1d..31210a9348 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JMAPModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.jmap.draft; +package org.apache.james.jmap; import java.io.FileNotFoundException; import java.io.IOException; @@ -33,9 +33,6 @@ import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.io.FileUtils; import org.apache.james.filesystem.api.FileSystem; -import org.apache.james.jmap.JMAPConfiguration; -import org.apache.james.jmap.JMAPServer; -import org.apache.james.jmap.Version; import org.apache.james.jmap.api.upload.JmapUploadQuotaConfiguration; import org.apache.james.jmap.core.CapabilityFactory; import org.apache.james.jmap.core.CoreCapabilityFactory; @@ -50,6 +47,9 @@ import org.apache.james.jmap.core.SharesCapabilityFactory$; import org.apache.james.jmap.core.SubmissionCapabilityFactory; import org.apache.james.jmap.core.VacationResponseCapabilityFactory$; import org.apache.james.jmap.core.WebSocketCapabilityFactory$; +import org.apache.james.jmap.draft.DraftMethodsModule; +import org.apache.james.jmap.draft.JMAPCommonModule; +import org.apache.james.jmap.draft.JMAPDraftConfiguration; import org.apache.james.jmap.draft.methods.RequestHandler; import org.apache.james.jmap.mailet.filter.JMAPFiltering; import org.apache.james.jmap.rfc8621.RFC8621MethodsModule; diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JmapGuiceProbe.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JmapGuiceProbe.java similarity index 98% rename from server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JmapGuiceProbe.java rename to server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JmapGuiceProbe.java index 40fcf3309f..2ab5b5356e 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/JmapGuiceProbe.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/JmapGuiceProbe.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.draft; +package org.apache.james.jmap; import static org.apache.james.jmap.utils.AccountIdUtil.toVacationAccountId; @@ -28,7 +28,6 @@ import jakarta.inject.Inject; import org.apache.james.core.Username; import org.apache.james.events.EventBus; import org.apache.james.events.EventListener; -import org.apache.james.jmap.JMAPServer; import org.apache.james.jmap.api.change.EmailChange; import org.apache.james.jmap.api.change.EmailChangeRepository; import org.apache.james.jmap.api.change.MailboxChangeRepository; diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/MessageIdProbe.java similarity index 98% rename from server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java rename to server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/MessageIdProbe.java index 9ef7104e06..839ad81c86 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/draft/MessageIdProbe.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/MessageIdProbe.java @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.draft; +package org.apache.james.jmap; import java.util.List; diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java index afd1357b22..a0d03712f7 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/modules/protocols/JMAPServerModule.java @@ -22,12 +22,12 @@ package org.apache.james.modules.protocols; import java.security.Security; import org.apache.james.jmap.JMAPConfiguration; +import org.apache.james.jmap.JMAPModule; import org.apache.james.jmap.JMAPRoutesHandler; import org.apache.james.jmap.JMAPServer; +import org.apache.james.jmap.JmapGuiceProbe; +import org.apache.james.jmap.MessageIdProbe; import org.apache.james.jmap.Version; -import org.apache.james.jmap.draft.JMAPModule; -import org.apache.james.jmap.draft.JmapGuiceProbe; -import org.apache.james.jmap.draft.MessageIdProbe; import org.apache.james.jmap.draft.crypto.JamesSignatureHandler; import org.apache.james.jmap.http.AuthenticationRoutes; import org.apache.james.jmap.http.DownloadRoutes; diff --git a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java index 970da77e7a..3777bccb56 100644 --- a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java +++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JMAPModuleTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.when; import java.util.EnumSet; -import org.apache.james.jmap.draft.JMAPModule.RequiredCapabilitiesStartUpCheck; +import org.apache.james.jmap.JMAPModule.RequiredCapabilitiesStartUpCheck; import org.apache.james.mailbox.MailboxManager; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; diff --git a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java index 2d0f7acfbb..064078b67a 100644 --- a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java +++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/JmapJamesServerContract.java @@ -25,6 +25,7 @@ import static io.restassured.config.RestAssuredConfig.newConfig; import java.nio.charset.StandardCharsets; import org.apache.james.GuiceJamesServer; +import org.apache.james.jmap.JmapGuiceProbe; import org.junit.jupiter.api.Test; import io.restassured.RestAssured; diff --git a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java index 36036858fa..ffdcddbd3b 100644 --- a/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java +++ b/server/container/guice/protocols/jmap/src/test/java/org/apache/james/jmap/draft/MailetPreconditionTest.java @@ -23,6 +23,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.apache.commons.configuration2.ex.ConfigurationException; +import org.apache.james.jmap.JMAPModule; import org.apache.james.jmap.mailet.filter.JMAPFiltering; import org.apache.james.mailetcontainer.impl.MatcherMailetPair; import org.apache.james.modules.server.MailetContainerModule; diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/RequeueThrottlingIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/RequeueThrottlingIntegrationTest.java index 7da19f0cd7..eea2726dd0 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/RequeueThrottlingIntegrationTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/RequeueThrottlingIntegrationTest.java @@ -35,7 +35,7 @@ import jakarta.mail.internet.MimeMessage; import org.apache.james.core.Username; import org.apache.james.core.builder.MimeMessageBuilder; -import org.apache.james.jmap.draft.MessageIdProbe; +import org.apache.james.jmap.MessageIdProbe; import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.MessageResult; import org.apache.james.mailbox.model.MultimailboxesSearchQuery; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java index 587d46ceaa..70457f904b 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java @@ -33,7 +33,7 @@ import java.time.format.DateTimeFormatter; import java.util.UUID; import org.apache.james.GuiceJamesServer; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.jmap.draft.model.ContinuationToken; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.utils.DataProbeImpl; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java index 4e4b962e3d..c407518671 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/JmapURIBuilder.java @@ -20,7 +20,7 @@ package org.apache.james.jmap; import org.apache.http.client.utils.URIBuilder; import org.apache.james.GuiceJamesServer; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.util.Port; public class JmapURIBuilder { diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ModularizeJmapDraftAuthenticationStrategyTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ModularizeJmapDraftAuthenticationStrategyTest.java index d89e15e131..fe15d3f10c 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ModularizeJmapDraftAuthenticationStrategyTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ModularizeJmapDraftAuthenticationStrategyTest.java @@ -36,7 +36,7 @@ import java.util.Optional; import org.apache.james.GuiceJamesServer; import org.apache.james.core.Username; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.utils.DataProbeImpl; import org.hamcrest.CoreMatchers; import org.junit.After; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java index 2a88e78772..5fdfa39aa9 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/ProvisioningTest.java @@ -35,7 +35,7 @@ import java.time.Duration; import org.apache.james.GuiceJamesServer; import org.apache.james.core.Username; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.modules.MailboxProbeImpl; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java index 446e9e300d..396422cc13 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationIntegrationTest.java @@ -42,7 +42,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.core.Username; import org.apache.james.jmap.api.model.AccountId; import org.apache.james.vacation.api.VacationPatch; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxConstants; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java index 96501f725e..7eaa7b088e 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/VacationRelayIntegrationTest.java @@ -33,7 +33,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.core.MailAddress; import org.apache.james.dnsservice.api.InMemoryDNSService; import org.apache.james.jmap.api.model.AccountId; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxConstants; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/CorsHeaderAPITest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/CorsHeaderAPITest.java index fe57a8bc6c..150ca92233 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/CorsHeaderAPITest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/CorsHeaderAPITest.java @@ -31,7 +31,7 @@ import java.io.IOException; import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.AccessToken; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.utils.DataProbeImpl; import org.junit.After; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java index cc8b30c175..4078ad1978 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/FilterTest.java @@ -47,7 +47,7 @@ import java.util.Locale; import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.AccessToken; import org.apache.james.jmap.JmapCommonRequests; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MailboxPath; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java index 1b9d35f742..03c0cd4181 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMailboxesMethodTest.java @@ -57,7 +57,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.core.quota.QuotaCountLimit; import org.apache.james.core.quota.QuotaSizeLimit; import org.apache.james.jmap.AccessToken; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.jmap.draft.model.mailbox.MailboxNamespace; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java index e8eb2a5a82..2e4c7ccfeb 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetMessageListMethodTest.java @@ -64,7 +64,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.core.Username; import org.apache.james.jmap.AccessToken; import org.apache.james.jmap.categories.CassandraAndOpenSearchCategory; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.jmap.model.Number; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java index be0dfcd3c7..5b790dec87 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/GetVacationResponseTest.java @@ -40,7 +40,7 @@ import org.apache.james.jmap.AccessToken; import org.apache.james.jmap.FixedDateZonedDateTimeProvider; import org.apache.james.jmap.api.model.AccountId; import org.apache.james.vacation.api.VacationPatch; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.probe.DataProbe; import org.apache.james.util.date.ZonedDateTimeProvider; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java index c35254607d..e052db70e2 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/QuotaMailingTest.java @@ -41,7 +41,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.core.Username; import org.apache.james.core.quota.QuotaSizeLimit; import org.apache.james.jmap.AccessToken; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.model.MailboxPath; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java index f1542c389f..c3067834a7 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SendMDNMethodTest.java @@ -48,7 +48,7 @@ import org.apache.james.core.Username; import org.apache.james.core.quota.QuotaSizeLimit; import org.apache.james.jmap.AccessToken; import org.apache.james.jmap.MessageAppender; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.exception.MailboxException; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java index 2cee94fe95..1c0c72c47a 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMailboxesMethodTest.java @@ -50,7 +50,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.core.Username; import org.apache.james.jmap.AccessToken; import org.apache.james.jmap.categories.CassandraAndOpenSearchCategory; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.MailboxManager; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java index 77da735bb6..5544adb455 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodReRoutingTest.java @@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit; import org.apache.james.GuiceJamesServer; import org.apache.james.core.Username; import org.apache.james.jmap.AccessToken; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.mailbox.Role; import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java index 1411b61f38..de65cf9a3c 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesMethodTest.java @@ -85,8 +85,8 @@ import org.apache.james.jmap.AccessToken; import org.apache.james.jmap.HttpJmapAuthentication; import org.apache.james.jmap.JmapCommonRequests; import org.apache.james.jmap.MessageAppender; -import org.apache.james.jmap.draft.JmapGuiceProbe; -import org.apache.james.jmap.draft.MessageIdProbe; +import org.apache.james.jmap.JmapGuiceProbe; +import org.apache.james.jmap.MessageIdProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.FlagsBuilder; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesOutboxFlagUpdateTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesOutboxFlagUpdateTest.java index 1dd258b486..54e16e93b6 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesOutboxFlagUpdateTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetMessagesOutboxFlagUpdateTest.java @@ -42,7 +42,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.core.Username; import org.apache.james.jmap.AccessToken; import org.apache.james.jmap.HttpJmapAuthentication; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.probe.MailboxProbe; import org.apache.james.modules.MailboxProbeImpl; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java index d9fa684aeb..18ccff4d45 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/SetVacationResponseTest.java @@ -39,7 +39,7 @@ import org.apache.james.jmap.AccessToken; import org.apache.james.jmap.api.model.AccountId; import org.apache.james.vacation.api.Vacation; import org.apache.james.vacation.api.VacationPatch; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.util.ValuePatch; import org.apache.james.utils.DataProbeImpl; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java index 5ebf6a496d..726dce955c 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java @@ -46,7 +46,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; import org.apache.james.core.Username; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.jmap.draft.methods.integration.cucumber.util.TableRow; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MainStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MainStepdefs.java index 7373b9cb49..ebc8fc6cc5 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MainStepdefs.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/MainStepdefs.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.stream.Stream; import org.apache.james.GuiceJamesServer; -import org.apache.james.jmap.draft.MessageIdProbe; +import org.apache.james.jmap.MessageIdProbe; import org.apache.james.mailbox.model.MailboxConstants; import org.apache.james.mailbox.model.MailboxId; import org.apache.james.mailbox.model.MessageId; diff --git a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java index b87673b189..67cd602b8c 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java +++ b/server/protocols/jmap-rfc-8621-integration-tests/distributed-jmap-rfc-8621-integration-tests/src/test/java/org/apache/james/jmap/rfc8621/distributed/ReadLevelTest.java @@ -39,7 +39,7 @@ import org.apache.james.JamesServerExtension; import org.apache.james.backends.cassandra.StatementRecorder; import org.apache.james.backends.cassandra.TestingSession; import org.apache.james.backends.cassandra.init.SessionWithInitializedTablesFactory; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.jmap.http.UserCredential; import org.apache.james.jmap.rfc8621.contract.Fixture; import org.apache.james.jmap.rfc8621.contract.tags.CategoryTags; diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/CustomMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/CustomMethodContract.scala index 30968a3950..09c33336f5 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/CustomMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/CustomMethodContract.scala @@ -44,14 +44,13 @@ import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JM import org.apache.james.jmap.core.Invocation.MethodName import org.apache.james.jmap.core.ResponseObject.SESSION_STATE import org.apache.james.jmap.core.{Capability, CapabilityFactory, CapabilityProperties, UrlPrefixes} -import org.apache.james.jmap.draft.JmapGuiceProbe import org.apache.james.jmap.http.UserCredential -import org.apache.james.jmap.mail import org.apache.james.jmap.method.{InvocationWithContext, Method} import org.apache.james.jmap.rfc8621.contract.CustomMethodContract.CUSTOM import org.apache.james.jmap.rfc8621.contract.DownloadContract.accountId import org.apache.james.jmap.rfc8621.contract.Fixture._ import org.apache.james.jmap.routes.{Applicable, Blob, BlobResolutionResult, BlobResolver, NonApplicable} +import org.apache.james.jmap.{JmapGuiceProbe, mail} import org.apache.james.mailbox.MailboxSession import org.apache.james.mailbox.model.ContentType import org.apache.james.utils.{DataProbeImpl, GuiceProbe} @@ -66,9 +65,7 @@ import sttp.client3.okhttp.OkHttpSyncBackend import sttp.client3.{Identity, RequestT, SttpBackend, asWebSocket, basicRequest} import sttp.model.Uri import sttp.monad.MonadError -import sttp.monad.syntax.MonadErrorOps import sttp.ws.WebSocketFrame -import sttp.ws.WebSocketFrame.Text import scala.util.{Success, Try} diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailChangesMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailChangesMethodContract.scala index 05271ba6aa..efbdb1ffdd 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailChangesMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailChangesMethodContract.scala @@ -33,10 +33,10 @@ import net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER import net.javacrumbs.jsonunit.core.internal.Options import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer +import org.apache.james.jmap.JmapGuiceProbe import org.apache.james.jmap.api.change.State import org.apache.james.jmap.api.model.AccountId import org.apache.james.jmap.core.ResponseObject.SESSION_STATE -import org.apache.james.jmap.draft.JmapGuiceProbe import org.apache.james.jmap.http.UserCredential import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, ACCOUNT_ID, ANDRE, ANDRE_ACCOUNT_ID, ANDRE_PASSWORD, BOB, BOB_PASSWORD, DOMAIN, authScheme, baseRequestSpecBuilder} import org.apache.james.mailbox.MessageManager.AppendCommand diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala index 397e759721..eaf73684d0 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailGetMethodContract.scala @@ -35,11 +35,11 @@ import net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER import net.javacrumbs.jsonunit.core.internal.Options import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer +import org.apache.james.jmap.JmapGuiceProbe import org.apache.james.jmap.api.change.State import org.apache.james.jmap.api.model.AccountId import org.apache.james.jmap.core.ResponseObject.SESSION_STATE import org.apache.james.jmap.core.UuidState.INSTANCE -import org.apache.james.jmap.draft.{JmapGuiceProbe} import org.apache.james.jmap.http.UserCredential import org.apache.james.jmap.rfc8621.contract.EmailGetMethodContract.createTestMessage import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, ALICE, ANDRE, ANDRE_ACCOUNT_ID, ANDRE_PASSWORD, BOB, BOB_PASSWORD, DOMAIN, authScheme, baseRequestSpecBuilder} diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala index 64133f42a4..b0b1698071 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala @@ -40,11 +40,11 @@ import org.apache.james.jmap.api.change.State import org.apache.james.jmap.core.ResponseObject.SESSION_STATE import org.apache.james.jmap.core.UTCDate import org.apache.james.jmap.core.UuidState.INSTANCE -import org.apache.james.jmap.draft.{JmapGuiceProbe, MessageIdProbe} import org.apache.james.jmap.http.UserCredential import org.apache.james.jmap.rfc8621.contract.DownloadContract.accountId import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, ACCOUNT_ID, ANDRE, ANDRE_ACCOUNT_ID, ANDRE_PASSWORD, BOB, BOB_PASSWORD, DOMAIN, authScheme, baseRequestSpecBuilder} import org.apache.james.jmap.rfc8621.contract.probe.DelegationProbe +import org.apache.james.jmap.{JmapGuiceProbe, MessageIdProbe} import org.apache.james.mailbox.MessageManager.AppendCommand import org.apache.james.mailbox.model.MailboxACL.Right import org.apache.james.mailbox.model.{ComposedMessageId, MailboxACL, MailboxConstants, MailboxId, MailboxPath, MessageId} @@ -59,7 +59,7 @@ import org.awaitility.Awaitility import org.awaitility.Durations.ONE_HUNDRED_MILLISECONDS import org.hamcrest.Matchers import org.hamcrest.Matchers.{equalTo, not} -import org.junit.jupiter.api.{BeforeEach, Disabled, Test} +import org.junit.jupiter.api.{BeforeEach, Test} import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.ValueSource import play.api.libs.json.{JsNumber, JsString, Json} diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EventSourceContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EventSourceContract.scala index a31f740cc2..7359cabc93 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EventSourceContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EventSourceContract.scala @@ -28,7 +28,7 @@ import io.restassured.RestAssured.{`given`, requestSpecification} import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer import org.apache.james.core.Username -import org.apache.james.jmap.draft.JmapGuiceProbe +import org.apache.james.jmap.JmapGuiceProbe import org.apache.james.jmap.http.UserCredential import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, ACCOUNT_ID, ANDRE, ANDRE_PASSWORD, BOB, BOB_PASSWORD, DAVID, DAVID_ACCOUNT_ID, DOMAIN, authScheme, baseRequestSpecBuilder} import org.apache.james.jmap.rfc8621.contract.probe.DelegationProbe diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/Fixture.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/Fixture.scala index 22ec754ee6..904a453331 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/Fixture.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/Fixture.scala @@ -32,8 +32,8 @@ import io.restassured.http.{ContentType, Header, Headers} import org.apache.james.GuiceJamesServer import org.apache.james.core.{Domain, Username} import org.apache.james.jmap.JMAPUrls.JMAP +import org.apache.james.jmap.JmapGuiceProbe import org.apache.james.jmap.core.ResponseObject.SESSION_STATE -import org.apache.james.jmap.draft.JmapGuiceProbe import org.apache.james.jmap.http.UserCredential import org.apache.james.mime4j.dom.Message diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MDNSendMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MDNSendMethodContract.scala index 165bd26bc8..e029aa9299 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MDNSendMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MDNSendMethodContract.scala @@ -31,8 +31,8 @@ import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer import org.apache.james.core.Username +import org.apache.james.jmap.MessageIdProbe import org.apache.james.jmap.core.ResponseObject.SESSION_STATE -import org.apache.james.jmap.draft.MessageIdProbe import org.apache.james.jmap.http.UserCredential import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, ACCOUNT_ID, ANDRE, ANDRE_ACCOUNT_ID, ANDRE_IDENTITY_ID, ANDRE_PASSWORD, BOB, BOB_PASSWORD, CEDRIC, DAVID, DOMAIN, IDENTITY_ID, authScheme, baseRequestSpecBuilder} import org.apache.james.jmap.rfc8621.contract.MDNSendMethodContract.TAG_MDN_MESSAGE_FORMAT diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxChangesMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxChangesMethodContract.scala index 7064c5a881..c62d2dc154 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxChangesMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxChangesMethodContract.scala @@ -32,10 +32,10 @@ import net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER import net.javacrumbs.jsonunit.core.internal.Options import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer +import org.apache.james.jmap.JmapGuiceProbe import org.apache.james.jmap.api.change.State import org.apache.james.jmap.api.model.AccountId import org.apache.james.jmap.core.ResponseObject.SESSION_STATE -import org.apache.james.jmap.draft.JmapGuiceProbe import org.apache.james.jmap.http.UserCredential import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, ANDRE, ANDRE_ACCOUNT_ID, ANDRE_PASSWORD, BOB, BOB_PASSWORD, DOMAIN, authScheme, baseRequestSpecBuilder} import org.apache.james.mailbox.MessageManager.AppendCommand diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxSetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxSetMethodContract.scala index b88fb32b43..533fb0f828 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxSetMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MailboxSetMethodContract.scala @@ -34,10 +34,10 @@ import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer import org.apache.james.jmap.core.ResponseObject.SESSION_STATE import org.apache.james.jmap.core.UuidState.INSTANCE -import org.apache.james.jmap.draft.{JmapGuiceProbe, MessageIdProbe} import org.apache.james.jmap.http.UserCredential import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, ACCOUNT_ID, ANDRE, BOB, BOB_PASSWORD, CEDRIC, DAVID, DOMAIN, authScheme, baseRequestSpecBuilder} import org.apache.james.jmap.rfc8621.contract.tags.CategoryTags +import org.apache.james.jmap.{JmapGuiceProbe, MessageIdProbe} import org.apache.james.mailbox.MessageManager.AppendCommand import org.apache.james.mailbox.model.MailboxACL.{EntryKey, Right} import org.apache.james.mailbox.model.{MailboxACL, MailboxId, MailboxPath} diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala index e3334d0811..30f2b3f398 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala @@ -30,7 +30,7 @@ import io.restassured.http.ContentType.JSON import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer -import org.apache.james.jmap.draft.JmapGuiceProbe +import org.apache.james.jmap.JmapGuiceProbe import org.apache.james.jmap.http.UserCredential import org.apache.james.jmap.rfc8621.contract.Fixture._ import org.apache.james.jmap.rfc8621.contract.SessionRoutesContract.{EXPECTED_BASE_PATH, expected_session_object} diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/VacationResponseGetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/VacationResponseGetMethodContract.scala index fc6a3e3f3a..1be1b48e0f 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/VacationResponseGetMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/VacationResponseGetMethodContract.scala @@ -27,10 +27,10 @@ import io.restassured.http.ContentType.JSON import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer +import org.apache.james.jmap.JmapGuiceProbe import org.apache.james.jmap.api.model.AccountId import org.apache.james.jmap.core.ResponseObject.SESSION_STATE import org.apache.james.jmap.core.UuidState.INSTANCE -import org.apache.james.jmap.draft.JmapGuiceProbe import org.apache.james.jmap.http.UserCredential import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, BOB, BOB_PASSWORD, DOMAIN, authScheme, baseRequestSpecBuilder} import org.apache.james.jmap.rfc8621.contract.VacationResponseGetMethodContract.VACATION_RESPONSE diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/WebSocketContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/WebSocketContract.scala index 0f04f7c453..3e105a6fa3 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/WebSocketContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/WebSocketContract.scala @@ -25,10 +25,10 @@ import java.util.concurrent.TimeUnit import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson import org.apache.james.GuiceJamesServer import org.apache.james.core.Username +import org.apache.james.jmap.JmapGuiceProbe import org.apache.james.jmap.api.change.State import org.apache.james.jmap.api.model.AccountId import org.apache.james.jmap.core.{PushState, UuidState} -import org.apache.james.jmap.draft.JmapGuiceProbe import org.apache.james.jmap.rfc8621.contract.Fixture._ import org.apache.james.jmap.rfc8621.contract.probe.DelegationProbe import org.apache.james.mailbox.MessageManager.AppendCommand diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/custom/authentication/strategy/ModularizeJmapRFC8621AuthenticationStrategyContract.java b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/custom/authentication/strategy/ModularizeJmapRFC8621AuthenticationStrategyContract.java index 6b2687fbff..9c06b0bfe3 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/custom/authentication/strategy/ModularizeJmapRFC8621AuthenticationStrategyContract.java +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/custom/authentication/strategy/ModularizeJmapRFC8621AuthenticationStrategyContract.java @@ -45,8 +45,8 @@ import java.util.List; import java.util.Optional; import org.apache.james.GuiceJamesServer; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.jmap.core.JmapRfc8621Configuration; -import org.apache.james.jmap.draft.JmapGuiceProbe; import org.apache.james.utils.DataProbeImpl; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java index 1f46a15d74..0cc6396c93 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/FixingGhostMailboxTest.java @@ -53,8 +53,8 @@ import org.apache.james.backends.cassandra.init.ClusterFactory; import org.apache.james.backends.cassandra.init.configuration.CassandraConfiguration; import org.apache.james.backends.cassandra.init.configuration.ClusterConfiguration; import org.apache.james.core.Username; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.jmap.JmapRFCCommonRequests; -import org.apache.james.jmap.draft.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.junit.categories.Unstable; import org.apache.james.mailbox.MessageManager.AppendCommand; diff --git a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java index 0f53563638..3ed49537c9 100644 --- a/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java +++ b/server/protocols/webadmin-integration-test/distributed-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/rabbitmq/RabbitMQReindexingWithEventDeadLettersTest.java @@ -42,7 +42,7 @@ import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.SearchConfiguration; import org.apache.james.events.RetryBackoffConfiguration; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.modules.AwsS3BlobStoreExtension; import org.apache.james.modules.RabbitMQExtension; diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUserDeletionIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUserDeletionIntegrationTest.java index ecada4e995..d1361a31dc 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUserDeletionIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUserDeletionIntegrationTest.java @@ -51,7 +51,7 @@ import org.apache.james.jmap.api.model.PushSubscription; import org.apache.james.jmap.api.model.PushSubscriptionCreationRequest; import org.apache.james.jmap.api.model.PushSubscriptionServerURL; import org.apache.james.jmap.api.pushsubscription.PushSubscriptionRepository; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxPath; import org.apache.james.modules.ACLProbeImpl; @@ -75,9 +75,7 @@ import com.google.inject.multibindings.Multibinder; import io.restassured.specification.RequestSpecification; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import scala.None; import scala.Option; -import scala.collection.immutable.Seq; class MemoryUserDeletionIntegrationTest { public static class MemoryUserDeletionIntegrationTestProbe implements GuiceProbe { diff --git a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUsernameChangeIntegrationTest.java b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUsernameChangeIntegrationTest.java index 7ec2f94451..e2bfef17f2 100644 --- a/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUsernameChangeIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/memory-webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/memory/MemoryUsernameChangeIntegrationTest.java @@ -55,7 +55,7 @@ import org.apache.james.jmap.api.filtering.FilteringManagement; import org.apache.james.jmap.api.filtering.Rule; import org.apache.james.jmap.api.filtering.Rules; import org.apache.james.jmap.api.filtering.Version; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.mailbox.MessageManager; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxPath; diff --git a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/FastViewProjectionHealthCheckIntegrationContract.java b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/FastViewProjectionHealthCheckIntegrationContract.java index 21f1fdfbc5..e014de3064 100644 --- a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/FastViewProjectionHealthCheckIntegrationContract.java +++ b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/FastViewProjectionHealthCheckIntegrationContract.java @@ -42,8 +42,8 @@ import java.util.stream.IntStream; import org.apache.james.GuiceJamesServer; import org.apache.james.core.healthcheck.ResultStatus; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.jmap.JmapRFCCommonRequests; -import org.apache.james.jmap.draft.JmapGuiceProbe; import org.apache.james.probe.DataProbe; import org.apache.james.util.Port; import org.apache.james.utils.DataProbeImpl; diff --git a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/ForwardIntegrationTest.java b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/ForwardIntegrationTest.java index 2f7a22bd9b..12098ffae4 100644 --- a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/ForwardIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/ForwardIntegrationTest.java @@ -39,8 +39,8 @@ import static org.hamcrest.Matchers.notNullValue; import java.io.IOException; import org.apache.james.GuiceJamesServer; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.jmap.JmapRFCCommonRequests; -import org.apache.james.jmap.draft.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.probe.MailboxProbe; diff --git a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/QuotaSearchIntegrationTest.java b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/QuotaSearchIntegrationTest.java index 19ab8ba041..5f5e5efb56 100644 --- a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/QuotaSearchIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/QuotaSearchIntegrationTest.java @@ -32,7 +32,7 @@ import java.nio.charset.StandardCharsets; import java.util.stream.IntStream; import org.apache.james.GuiceJamesServer; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.model.MailboxACL; import org.apache.james.mailbox.model.MailboxId; diff --git a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/DeletedMessageVaultIntegrationTest.java b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/DeletedMessageVaultIntegrationTest.java index 4d5d0c5afc..df7613f3e1 100644 --- a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/DeletedMessageVaultIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/DeletedMessageVaultIntegrationTest.java @@ -57,7 +57,7 @@ import java.util.Map; import org.apache.james.GuiceJamesServer; import org.apache.james.GuiceModuleTestExtension; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.junit.categories.BasicFeature; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.Role; diff --git a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/LinshareBlobExportMechanismIntegrationTest.java b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/LinshareBlobExportMechanismIntegrationTest.java index d733ec5432..ef4752560e 100644 --- a/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/LinshareBlobExportMechanismIntegrationTest.java +++ b/server/protocols/webadmin-integration-test/webadmin-integration-test-common/src/main/java/org/apache/james/webadmin/integration/vault/LinshareBlobExportMechanismIntegrationTest.java @@ -44,8 +44,8 @@ import java.util.List; import org.apache.james.GuiceJamesServer; import org.apache.james.core.Username; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.jmap.JmapRFCCommonRequests; -import org.apache.james.jmap.draft.JmapGuiceProbe; import org.apache.james.linshare.client.Document; import org.apache.james.mailbox.DefaultMailboxes; import org.apache.james.mailbox.backup.ZipAssert; diff --git a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinContract.java b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinContract.java index 284698093d..1de0596eed 100644 --- a/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinContract.java +++ b/third-party/spamassassin/src/test/java/org/apache/james/spamassassin/SpamAssassinContract.java @@ -19,7 +19,6 @@ package org.apache.james.spamassassin; - import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.with; import static io.restassured.config.EncoderConfig.encoderConfig; @@ -41,7 +40,7 @@ import java.util.function.Consumer; import org.apache.james.GuiceJamesServer; import org.apache.james.jmap.JmapRFCCommonRequests; -import org.apache.james.jmap.draft.JmapGuiceProbe; +import org.apache.james.jmap.JmapGuiceProbe; import org.apache.james.mailbox.Role; import org.apache.james.modules.protocols.ImapGuiceProbe; import org.apache.james.utils.DataProbeImpl; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
