This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push: new f72ad3039f JAMES-3917 Maven build should be strict about Scala imports ordering in the code (#1604) f72ad3039f is described below commit f72ad3039fc8d7b1fa212d1f9f892ddbbe0c2579 Author: vttran <vtt...@linagora.com> AuthorDate: Sun Jun 25 19:25:12 2023 +0700 JAMES-3917 Maven build should be strict about Scala imports ordering in the code (#1604) --- .scalafix.conf | 9 ++++++++- .../james/eventsourcing/CommandDispatcher.scala | 1 - .../eventsourcing/EventSourcingSystemTest.scala | 3 +-- pom.xml | 7 +++++++ .../rfc8621/contract/AuthenticationContract.scala | 2 +- .../jmap/rfc8621/contract/DelegateSetContract.scala | 5 +++-- .../jmap/rfc8621/contract/DownloadContract.scala | 1 + .../rfc8621/contract/EmailParseMethodContract.scala | 4 ---- .../rfc8621/contract/MDNParseMethodContract.scala | 6 +++--- .../rfc8621/contract/MDNSendMethodContract.scala | 2 +- .../contract/MailboxChangesMethodContract.scala | 8 ++++---- .../rfc8621/contract/MailboxSetMethodContract.scala | 7 ++++--- .../PushSubscriptionSetMethodContract.scala | 21 ++++++++++----------- .../contract/QuotaChangesMethodContract.scala | 8 ++++---- .../rfc8621/contract/QuotaGetMethodContract.scala | 15 ++++++--------- .../rfc8621/contract/QuotaQueryMethodContract.scala | 6 +++--- .../rfc8621/contract/SessionRoutesContract.scala | 6 ++---- .../jmap/rfc8621/contract/UploadContract.scala | 1 + .../VacationResponseGetMethodContract.scala | 1 + .../james/jmap/change/MailboxChangeListener.scala | 1 + .../apache/james/jmap/delegation/DelegateGet.scala | 4 +--- .../james/jmap/delegation/DelegatedAccountGet.scala | 4 ++-- .../org/apache/james/jmap/json/PushSerializer.scala | 2 +- .../jmap/json/PushSubscriptionSerializer.scala | 1 - .../apache/james/jmap/json/ResponseSerializer.scala | 2 +- .../org/apache/james/jmap/mail/EmailBodyPart.scala | 2 +- .../scala/org/apache/james/jmap/mail/EmailGet.scala | 1 - .../scala/org/apache/james/jmap/mail/Keyword.scala | 2 +- .../scala/org/apache/james/jmap/mail/Keywords.scala | 2 +- .../main/scala/org/apache/james/jmap/mail/MDN.scala | 3 ++- .../scala/org/apache/james/jmap/mail/MDNSend.scala | 4 ++-- .../scala/org/apache/james/jmap/mail/Quotas.scala | 5 +++-- .../james/jmap/method/DelegateGetMethod.scala | 2 +- .../jmap/method/DelegateSetDeletePerformer.scala | 3 +-- .../james/jmap/method/DelegateSetMethod.scala | 3 +-- .../jmap/method/DelegatedAccountGetMethod.scala | 2 +- .../jmap/method/DelegatedAccountSetMethod.scala | 3 +-- .../james/jmap/method/EmailChangesMethod.scala | 2 +- .../apache/james/jmap/method/EmailGetMethod.scala | 6 +++--- .../james/jmap/method/EmailImportMethod.scala | 5 +++-- .../apache/james/jmap/method/EmailParseMethod.scala | 5 +++-- .../apache/james/jmap/method/EmailQueryMethod.scala | 7 ++++--- .../apache/james/jmap/method/EmailSetMethod.scala | 3 +-- .../jmap/method/EmailSubmissionSetMethod.scala | 13 +++++++------ .../james/jmap/method/IdentityChangesMethod.scala | 3 +-- .../james/jmap/method/IdentityGetMethod.scala | 3 +-- .../james/jmap/method/IdentitySetMethod.scala | 3 +-- .../apache/james/jmap/method/MDNParseMethod.scala | 5 +++-- .../apache/james/jmap/method/MDNSendMethod.scala | 6 +++--- .../james/jmap/method/MailboxChangesMethod.scala | 2 +- .../apache/james/jmap/method/MailboxGetMethod.scala | 2 +- .../james/jmap/method/MailboxQueryMethod.scala | 3 +-- .../apache/james/jmap/method/MailboxSetMethod.scala | 3 +-- .../jmap/method/PushSubscriptionGetMethod.scala | 2 +- .../jmap/method/PushSubscriptionSetMethod.scala | 3 +-- .../james/jmap/method/QuotaChangesMethod.scala | 3 +-- .../apache/james/jmap/method/QuotaGetMethod.scala | 3 +-- .../apache/james/jmap/method/QuotaQueryMethod.scala | 3 +-- .../james/jmap/method/ThreadChangesMethod.scala | 3 +-- .../apache/james/jmap/method/ThreadGetMethod.scala | 2 +- .../jmap/method/VacationResponseGetMethod.scala | 3 +-- .../jmap/method/VacationResponseSetMethod.scala | 3 +-- .../apache/james/jmap/routes/DownloadRoutes.scala | 2 +- .../james/jmap/routes/ProcessingContext.scala | 2 +- .../apache/james/jmap/routes/SessionRoutes.scala | 7 ++++--- .../apache/james/jmap/routes/SessionSupplier.scala | 5 +++-- .../org/apache/james/jmap/routes/UploadRoutes.scala | 2 +- .../james/jmap/vacation/VacationResponseSet.scala | 3 ++- .../jmap/change/MailboxChangeListenerTest.scala | 7 ++++--- .../james/jmap/change/StateChangeListenerTest.scala | 2 -- .../james/jmap/http/UserCredentialParserTest.scala | 6 +++--- .../apache/james/jmap/json/PushSerializerTest.scala | 4 ++-- .../james/jmap/routes/SessionRoutesTest.scala | 1 + 73 files changed, 147 insertions(+), 149 deletions(-) diff --git a/.scalafix.conf b/.scalafix.conf index b00dda3982..392b670b6d 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -2,7 +2,14 @@ rules = [ DisableSyntax, ProcedureSyntax, NoValInForComprehension, - LeakingImplicitClassVal + LeakingImplicitClassVal, + SortImports +] + +SortImports.blocks = [ + "re:java?\\.", + "*", + "scala.", ] RemoveUnused.imports = true diff --git a/event-sourcing/event-sourcing-core/src/main/scala/org/apache/james/eventsourcing/CommandDispatcher.scala b/event-sourcing/event-sourcing-core/src/main/scala/org/apache/james/eventsourcing/CommandDispatcher.scala index 14f45df78b..c33f302bbb 100644 --- a/event-sourcing/event-sourcing-core/src/main/scala/org/apache/james/eventsourcing/CommandDispatcher.scala +++ b/event-sourcing/event-sourcing-core/src/main/scala/org/apache/james/eventsourcing/CommandDispatcher.scala @@ -21,7 +21,6 @@ package org.apache.james.eventsourcing import java.util import com.google.common.base.Preconditions -import com.google.common.collect.ImmutableList import javax.inject.Inject import org.apache.james.eventsourcing.eventstore.EventStoreFailedException import org.reactivestreams.Publisher diff --git a/event-sourcing/event-sourcing-core/src/test/scala/org/apache/james/eventsourcing/EventSourcingSystemTest.scala b/event-sourcing/event-sourcing-core/src/test/scala/org/apache/james/eventsourcing/EventSourcingSystemTest.scala index e658841c97..9bc25ee4a7 100644 --- a/event-sourcing/event-sourcing-core/src/test/scala/org/apache/james/eventsourcing/EventSourcingSystemTest.scala +++ b/event-sourcing/event-sourcing-core/src/test/scala/org/apache/james/eventsourcing/EventSourcingSystemTest.scala @@ -20,6 +20,7 @@ package org.apache.james.eventsourcing import java.util.{List => JavaList} +import com.google.common.base.Splitter import org.apache.james.eventsourcing.eventstore.{EventStore, History} import org.assertj.core.api.Assertions.{assertThat, assertThatThrownBy} import org.junit.jupiter.api.Test @@ -28,8 +29,6 @@ import org.mockito.Mockito.{doThrow, mock, when} import org.mockito.internal.matchers.InstanceOf import org.mockito.internal.progress.ThreadSafeMockingProgress import org.reactivestreams.Publisher - -import com.google.common.base.Splitter import reactor.core.publisher.Mono import reactor.core.scala.publisher.SMono diff --git a/pom.xml b/pom.xml index 1b09d6ddb3..ec2a265791 100644 --- a/pom.xml +++ b/pom.xml @@ -3009,6 +3009,13 @@ <config>${basedir}/.scalafix.conf</config> <mode>CHECK</mode> </configuration> + <dependencies> + <dependency> + <groupId>com.nequissimus</groupId> + <artifactId>sort-imports_${scala.base}</artifactId> + <version>0.6.1</version> + </dependency> + </dependencies> <executions> <execution> <id>scala-check-style</id> 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/AuthenticationContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/AuthenticationContract.scala index a50fae9758..86a3fbc6dd 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/AuthenticationContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/AuthenticationContract.scala @@ -25,7 +25,7 @@ import io.restassured.authentication.NoAuthScheme import io.restassured.http.Header import org.apache.http.HttpStatus.{SC_BAD_REQUEST, SC_OK, SC_UNAUTHORIZED} import org.apache.james.GuiceJamesServer -import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, ALICE, ALICE_PASSWORD, AUTHORIZATION_HEADER, BOB, BOB_BASIC_AUTH_HEADER, BOB_PASSWORD, DOMAIN, DOMAIN_WITH_SPACE, ECHO_REQUEST_OBJECT, INVALID_JWT_TOKEN, UNKNOWN_USER_TOKEN, USER_TOKEN, getHeadersWith, toBase64, _} +import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, ALICE, ALICE_PASSWORD, AUTHORIZATION_HEADER, BOB, BOB_BASIC_AUTH_HEADER, BOB_PASSWORD, DOMAIN, DOMAIN_WITH_SPACE, ECHO_REQUEST_OBJECT, INVALID_JWT_TOKEN, UNKNOWN_USER_TOKEN, USER, USER_PASSWORD, USER_TOKEN, _2_DOT_DOMAIN, baseRequestSpecBuilder, getHeadersWith, toBase64} import org.apache.james.jmap.rfc8621.contract.tags.CategoryTags import org.apache.james.utils.DataProbeImpl import org.hamcrest.Matchers.{containsString, equalTo} 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/DelegateSetContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/DelegateSetContract.scala index 5eb3092b3a..86e25edba1 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/DelegateSetContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/DelegateSetContract.scala @@ -19,6 +19,9 @@ package org.apache.james.jmap.rfc8621.contract +import java.util.UUID +import java.util.concurrent.TimeUnit + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured.{`given`, requestSpecification} import io.restassured.http.ContentType.JSON @@ -37,8 +40,6 @@ import org.awaitility.Awaitility import org.awaitility.Durations.ONE_HUNDRED_MILLISECONDS import org.junit.jupiter.api.{BeforeEach, Test} -import java.util.UUID -import java.util.concurrent.TimeUnit import scala.jdk.CollectionConverters._ object DelegateSetContract { 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/DownloadContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/DownloadContract.scala index 6c93b6427f..6bbd8b2143 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/DownloadContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/DownloadContract.scala @@ -21,6 +21,7 @@ package org.apache.james.jmap.rfc8621.contract import java.io.ByteArrayInputStream import java.nio.charset.StandardCharsets + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured.{`given`, requestSpecification} import org.apache.commons.io.IOUtils 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/EmailParseMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailParseMethodContract.scala index 6c522a2392..be5fa494aa 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailParseMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailParseMethodContract.scala @@ -19,14 +19,10 @@ package org.apache.james.jmap.rfc8621.contract -import java.io.ByteArrayInputStream -import java.nio.charset.StandardCharsets - import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured._ import io.restassured.http.ContentType.JSON import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson -import org.apache.commons.io.IOUtils import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer import org.apache.james.jmap.core.ResponseObject.SESSION_STATE 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/MDNParseMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MDNParseMethodContract.scala index 4dd9adef9c..9eb7cb8c9c 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MDNParseMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/MDNParseMethodContract.scala @@ -19,6 +19,9 @@ package org.apache.james.jmap.rfc8621.contract +import java.nio.charset.StandardCharsets +import java.util.concurrent.TimeUnit + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured._ import io.restassured.http.ContentType.JSON @@ -41,9 +44,6 @@ import org.awaitility.Durations.ONE_HUNDRED_MILLISECONDS import org.junit.jupiter.api.{BeforeEach, Test} import play.api.libs.json._ -import java.nio.charset.StandardCharsets -import java.util.concurrent.TimeUnit - trait MDNParseMethodContract { private lazy val slowPacedPollInterval = ONE_HUNDRED_MILLISECONDS private lazy val calmlyAwait = Awaitility.`with` 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 45b14a21dd..165bd26bc8 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 @@ -34,7 +34,7 @@ import org.apache.james.core.Username 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.{BOB, BOB_PASSWORD, DOMAIN, authScheme, baseRequestSpecBuilder, _} +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 import org.apache.james.mailbox.MessageManager.AppendCommand import org.apache.james.mailbox.model.{MailboxId, MailboxPath, MessageId, MultimailboxesSearchQuery, SearchQuery} 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 6989bff938..525422a2a1 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 @@ -19,10 +19,14 @@ package org.apache.james.jmap.rfc8621.contract +import java.nio.charset.StandardCharsets +import java.util.concurrent.TimeUnit + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured.{`given`, requestSpecification} import io.restassured.builder.ResponseSpecBuilder import io.restassured.http.ContentType.JSON +import javax.mail.Flags import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson import net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER import net.javacrumbs.jsonunit.core.internal.Options @@ -46,10 +50,6 @@ import org.awaitility.Durations.ONE_HUNDRED_MILLISECONDS import org.junit.jupiter.api.{BeforeEach, Nested, Test} import play.api.libs.json.{JsArray, JsString, Json} -import java.nio.charset.StandardCharsets -import java.util.concurrent.TimeUnit -import javax.mail.Flags - trait MailboxChangesMethodContract { private lazy val slowPacedPollInterval = ONE_HUNDRED_MILLISECONDS 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 261eaab4ed..632c3957da 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 @@ -19,6 +19,10 @@ package org.apache.james.jmap.rfc8621.contract +import java.net.URI +import java.nio.charset.StandardCharsets +import java.time.Duration + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured._ import io.restassured.http.ContentType.JSON @@ -58,9 +62,6 @@ import sttp.monad.syntax.MonadErrorOps import sttp.ws.WebSocketFrame import sttp.ws.WebSocketFrame.Text -import java.net.URI -import java.nio.charset.StandardCharsets -import java.time.Duration import scala.collection.mutable.ListBuffer import scala.jdk.CollectionConverters._ 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/PushSubscriptionSetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/PushSubscriptionSetMethodContract.scala index 773186c0da..6e3e4a883d 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/PushSubscriptionSetMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/PushSubscriptionSetMethodContract.scala @@ -19,11 +19,18 @@ package org.apache.james.jmap.rfc8621.contract +import java.net.URL +import java.security.KeyPair +import java.security.interfaces.ECPublicKey +import java.time.ZonedDateTime +import java.time.format.DateTimeFormatter +import java.util.{Base64, UUID} + import com.google.common.collect.ImmutableSet -import com.google.inject.AbstractModule -import com.google.inject.multibindings.Multibinder import com.google.crypto.tink.subtle.EllipticCurves.CurveType import com.google.crypto.tink.subtle.{EllipticCurves, Random} +import com.google.inject.AbstractModule +import com.google.inject.multibindings.Multibinder import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured.{`given`, requestSpecification} import io.restassured.http.ContentType.JSON @@ -44,7 +51,6 @@ import org.apache.james.utils.{DataProbeImpl, GuiceProbe} import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.SoftAssertions import org.junit.jupiter.api.{BeforeEach, Test} -import reactor.core.scala.publisher.SMono import org.mockserver.integration.ClientAndServer import org.mockserver.model.HttpRequest.request import org.mockserver.model.HttpResponse.response @@ -53,14 +59,7 @@ import org.mockserver.model.Not.not import org.mockserver.model.NottableString.string import org.mockserver.model.{HttpRequest, HttpResponse} import org.mockserver.verify.VerificationTimes - -import java.net.URL -import java.security.KeyPair -import java.security.interfaces.ECPublicKey -import java.time.ZonedDateTime -import java.time.format.DateTimeFormatter -import java.util.Base64 -import java.util.UUID +import reactor.core.scala.publisher.SMono import scala.jdk.CollectionConverters._ 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/QuotaChangesMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/QuotaChangesMethodContract.scala index dacb2fa693..bf940414ba 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/QuotaChangesMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/QuotaChangesMethodContract.scala @@ -19,6 +19,10 @@ package org.apache.james.jmap.rfc8621.contract +import java.nio.charset.StandardCharsets +import java.time.Duration +import java.util.concurrent.TimeUnit + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured.{`given`, requestSpecification} import io.restassured.http.ContentType.JSON @@ -40,10 +44,6 @@ import org.assertj.core.api.Assertions.assertThat import org.awaitility.Awaitility import org.junit.jupiter.api.{BeforeEach, Test} -import java.nio.charset.StandardCharsets -import java.time.Duration -import java.util.concurrent.TimeUnit - trait QuotaChangesMethodContract { 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/QuotaGetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/QuotaGetMethodContract.scala index cc2c795252..1b36049303 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/QuotaGetMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/QuotaGetMethodContract.scala @@ -19,6 +19,10 @@ package org.apache.james.jmap.rfc8621.contract +import java.nio.charset.StandardCharsets +import java.time.Duration +import java.util.concurrent.TimeUnit + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured.{`given`, requestSpecification} import io.restassured.http.ContentType.JSON @@ -29,24 +33,17 @@ import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer import org.apache.james.core.quota.{QuotaCountLimit, QuotaSizeLimit} import org.apache.james.jmap.core.ResponseObject.SESSION_STATE -import org.apache.james.jmap.core.UuidState.INSTANCE import org.apache.james.jmap.http.UserCredential import org.apache.james.jmap.mail.{CountResourceType, QuotaIdFactory} import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, ANDRE, ANDRE_PASSWORD, BOB, BOB_PASSWORD, DOMAIN, authScheme, baseRequestSpecBuilder} import org.apache.james.mailbox.MessageManager.AppendCommand +import org.apache.james.mailbox.model.MailboxACL.Right.{Lookup, Read} import org.apache.james.mailbox.model.{MailboxACL, MailboxPath} import org.apache.james.mime4j.dom.Message import org.apache.james.modules.{ACLProbeImpl, MailboxProbeImpl, QuotaProbesImpl} import org.apache.james.utils.DataProbeImpl -import org.junit.jupiter.api.{BeforeEach, Test} - -import java.nio.charset.StandardCharsets -import org.apache.james.mailbox.model.MailboxACL.Right.Read -import org.apache.james.mailbox.model.MailboxACL.Right.Lookup import org.awaitility.Awaitility - -import java.time.Duration -import java.util.concurrent.TimeUnit +import org.junit.jupiter.api.{BeforeEach, Test} trait QuotaGetMethodContract { 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/QuotaQueryMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/QuotaQueryMethodContract.scala index 8279966465..102bd80d67 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/QuotaQueryMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/QuotaQueryMethodContract.scala @@ -19,6 +19,9 @@ package org.apache.james.jmap.rfc8621.contract +import java.time.Duration +import java.util.concurrent.TimeUnit + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured.{`given`, requestSpecification} import io.restassured.http.ContentType.JSON @@ -36,9 +39,6 @@ import org.apache.james.utils.DataProbeImpl import org.awaitility.Awaitility import org.junit.jupiter.api.{BeforeEach, Test} -import java.time.Duration -import java.util.concurrent.TimeUnit - trait QuotaQueryMethodContract { private lazy val awaitAtMostTenSeconds = Awaitility.`with` 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 8548fac0ed..4c1a26d609 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 @@ -18,6 +18,8 @@ * ***************************************************************/ package org.apache.james.jmap.rfc8621.contract +import java.nio.charset.StandardCharsets + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured._ import io.restassured.builder.RequestSpecBuilder @@ -35,11 +37,7 @@ import org.apache.james.jmap.rfc8621.contract.SessionRoutesContract.{EXPECTED_BA import org.apache.james.jmap.rfc8621.contract.tags.CategoryTags import org.apache.james.utils.DataProbeImpl import org.hamcrest.Matchers -import org.hamcrest.Matchers.empty -import org.hamcrest.collection.IsIterableContainingInAnyOrder import org.junit.jupiter.api.{BeforeEach, Tag, Test} - -import java.nio.charset.StandardCharsets object SessionRoutesContract { private val expected_session_object: String = """{ | "capabilities" : { 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/UploadContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/UploadContract.scala index 25e9ed1a5d..87b6379037 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/UploadContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/UploadContract.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.rfc8621.contract import java.io.ByteArrayInputStream import java.nio.charset.StandardCharsets + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured.{`given`, requestSpecification} import io.restassured.http.ContentType 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 3d0e414755..fc6a3e3f3a 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 @@ -20,6 +20,7 @@ package org.apache.james.jmap.rfc8621.contract import java.time.ZonedDateTime + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured.{`given`, requestSpecification} import io.restassured.http.ContentType.JSON diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/MailboxChangeListener.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/MailboxChangeListener.scala index 04ff153801..e12adfd57b 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/MailboxChangeListener.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/MailboxChangeListener.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.change import java.time.{Clock, ZonedDateTime} + import javax.inject.{Inject, Named} import org.apache.james.core.Username import org.apache.james.events.Event.EventId diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/delegation/DelegateGet.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/delegation/DelegateGet.scala index b1422f85f4..e31ff8c4c4 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/delegation/DelegateGet.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/delegation/DelegateGet.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.delegation import java.util.UUID + import eu.timepit.refined.auto._ import org.apache.james.core.Username import org.apache.james.jmap.core.Id.Id @@ -28,9 +29,6 @@ import org.apache.james.jmap.method.WithAccountId import scala.util.Try -import java.util.UUID -import scala.util.Try - object DelegateGet { val allProperties: Properties = Properties("id", "username") val idProperty: Properties = Properties("id") diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/delegation/DelegatedAccountGet.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/delegation/DelegatedAccountGet.scala index aba972feb7..b387e572af 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/delegation/DelegatedAccountGet.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/delegation/DelegatedAccountGet.scala @@ -19,10 +19,10 @@ package org.apache.james.jmap.delegation -import org.apache.james.jmap.core.{AccountId, Properties} +import eu.timepit.refined.auto._ import org.apache.james.jmap.core.Id.Id +import org.apache.james.jmap.core.{AccountId, Properties} import org.apache.james.jmap.method.WithAccountId -import eu.timepit.refined.auto._ object DelegatedAccountGet { val allProperties: Properties = Properties("id", "username") diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/PushSerializer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/PushSerializer.scala index c592b2808b..e02cbb70c5 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/PushSerializer.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/PushSerializer.scala @@ -19,6 +19,7 @@ package org.apache.james.jmap.json +import javax.inject.Inject import org.apache.james.jmap.api.change.TypeStateFactory import org.apache.james.jmap.api.model.{State, TypeName} import org.apache.james.jmap.change.TypeState @@ -26,7 +27,6 @@ import org.apache.james.jmap.core.{AccountId, OutboundMessage, PingMessage, Push import org.apache.james.jmap.method.PushVerification import play.api.libs.json.{Format, JsError, JsNull, JsObject, JsResult, JsString, JsSuccess, JsValue, Json, OWrites, Reads, Writes} -import javax.inject.Inject import scala.util.Try object PushSerializer { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/PushSubscriptionSerializer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/PushSubscriptionSerializer.scala index 920290d098..aa23892582 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/PushSubscriptionSerializer.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/PushSubscriptionSerializer.scala @@ -21,7 +21,6 @@ package org.apache.james.jmap.json import eu.timepit.refined import eu.timepit.refined.refineV - import javax.inject.Inject import org.apache.james.jmap.api.change.TypeStateFactory import org.apache.james.jmap.api.model.{DeviceClientId, PushSubscriptionCreationRequest, PushSubscriptionExpiredTime, PushSubscriptionId, PushSubscriptionKeys, PushSubscriptionServerURL, TypeName, VerificationCode} diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/ResponseSerializer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/ResponseSerializer.scala index 609f68f50a..04f78d1c9d 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/ResponseSerializer.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/ResponseSerializer.scala @@ -30,7 +30,7 @@ import org.apache.james.jmap.core.CapabilityIdentifier.CapabilityIdentifier import org.apache.james.jmap.core.Id.IdConstraint import org.apache.james.jmap.core.Invocation.{Arguments, MethodCallId, MethodName} import org.apache.james.jmap.core.SetError.SetErrorDescription -import org.apache.james.jmap.core.{Account, Invocation, Session, _} +import org.apache.james.jmap.core.{Account, AccountId, Capabilities, Capability, ClientId, CoreCapabilityProperties, CreatedIds, EhloArg, EhloArgs, EhloName, Invocation, IsPersonal, IsReadOnly, MailCapabilityProperties, MaxCallsInRequest, MaxConcurrentRequests, MaxConcurrentUpload, MaxDelayedSend, MaxMailboxDepth, MaxMailboxesPerEmail, MaxObjectsInGet, MaxObjectsInSet, MaxSizeAttachmentsPerEmail, MaxSizeMailboxName, MaxSizeRequest, MaxSizeUpload, MayCreateTopLevelMailbox, ProblemDetails, [...] import play.api.libs.functional.syntax._ import play.api.libs.json._ diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailBodyPart.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailBodyPart.scala index 4d2a414fcf..f0dd8b62d4 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailBodyPart.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailBodyPart.scala @@ -19,7 +19,7 @@ package org.apache.james.jmap.mail -import java.io.{InputStream, OutputStream} +import java.io.OutputStream import java.time.ZoneId import cats.implicits._ diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailGet.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailGet.scala index a479e1f8f8..62028c7b38 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailGet.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailGet.scala @@ -31,7 +31,6 @@ import org.apache.james.jmap.mail.EmailGetRequest.MaxBodyValueBytes import org.apache.james.jmap.mail.EmailHeaders.SPECIFIC_HEADER_PREFIX import org.apache.james.jmap.method.WithAccountId import org.apache.james.mailbox.model.MessageId -import org.apache.james.mime4j.dom.Message import org.apache.james.mime4j.stream.Field import scala.jdk.CollectionConverters._ diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Keyword.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Keyword.scala index aec3cc6984..002eb0cd4a 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Keyword.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Keyword.scala @@ -21,9 +21,9 @@ package org.apache.james.jmap.mail import java.util.Locale +import com.google.common.base.CharMatcher import javax.mail.Flags import org.apache.commons.lang3.StringUtils -import com.google.common.base.CharMatcher import scala.util.{Failure, Success, Try} diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Keywords.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Keywords.scala index 604d8627f7..f48aa4d686 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Keywords.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Keywords.scala @@ -18,9 +18,9 @@ ****************************************************************/ package org.apache.james.jmap.mail +import javax.mail.Flags import org.apache.james.mailbox.FlagsBuilder -import javax.mail.Flags import scala.util.{Failure, Success, Try} trait ToKeyword { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/MDN.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/MDN.scala index e358df684d..c6fc8a2aa5 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/MDN.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/MDN.scala @@ -19,6 +19,8 @@ package org.apache.james.jmap.mail +import java.util.Locale + import org.apache.james.core.MailAddress import org.apache.james.jmap.core.SetError.SetErrorDescription import org.apache.james.jmap.core.{Properties, SetError} @@ -29,7 +31,6 @@ import org.apache.james.mdn.action.mode.DispositionActionMode import org.apache.james.mdn.fields.{FinalRecipient, ReportingUserAgent, Disposition => JavaDisposition} import org.apache.james.mdn.sending.mode.DispositionSendingMode -import java.util.Locale import scala.util.{Failure, Success, Try} object MDN { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/MDNSend.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/MDNSend.scala index c69effc27f..743252ef37 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/MDNSend.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/MDNSend.scala @@ -19,6 +19,8 @@ package org.apache.james.jmap.mail +import java.util.UUID + import cats.implicits.toTraverseOps import org.apache.james.jmap.core.Id.Id import org.apache.james.jmap.core.SetError.SetErrorDescription @@ -27,8 +29,6 @@ import org.apache.james.jmap.method.{WithAccountId, standardError} import org.apache.james.mailbox.model.MessageId import play.api.libs.json.{JsObject, JsPath, JsonValidationError} -import java.util.UUID - object MDNSend { val MDN_ALREADY_SENT_FLAG: String = "$mdnsent" } diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Quotas.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Quotas.scala index 699c5c88c8..9e743d066e 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Quotas.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Quotas.scala @@ -19,6 +19,9 @@ package org.apache.james.jmap.mail +import java.nio.charset.StandardCharsets +import java.util.UUID + import com.google.common.hash.Hashing import eu.timepit.refined.auto._ import org.apache.james.core.Domain @@ -31,8 +34,6 @@ import org.apache.james.jmap.core.{AccountId, CanCalculateChanges, Id, Propertie import org.apache.james.jmap.method.WithAccountId import org.apache.james.mailbox.model.{Quota => ModelQuota, QuotaRoot => ModelQuotaRoot} -import java.nio.charset.StandardCharsets -import java.util.UUID import scala.compat.java8.OptionConverters._ object QuotaRoot { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateGetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateGetMethod.scala index 16cc71fab8..db8eefbdbd 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateGetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateGetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.core.Username import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_DELEGATION, JMAP_CORE} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} @@ -34,7 +35,6 @@ import org.reactivestreams.Publisher import play.api.libs.json.JsObject import reactor.core.scala.publisher.{SFlux, SMono} -import javax.inject.Inject import scala.jdk.OptionConverters._ diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateSetDeletePerformer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateSetDeletePerformer.scala index 01ec444afa..8174f0c610 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateSetDeletePerformer.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateSetDeletePerformer.scala @@ -19,6 +19,7 @@ package org.apache.james.jmap.method +import javax.inject.Inject import org.apache.james.core.Username import org.apache.james.jmap.core.SetError import org.apache.james.jmap.core.SetError.SetErrorDescription @@ -29,8 +30,6 @@ import org.apache.james.user.api.DelegationStore import org.apache.james.util.ReactorUtils import reactor.core.scala.publisher.{SFlux, SMono} -import javax.inject.Inject - object DelegateSetDeletePerformer { sealed trait DelegateDeletionResult diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateSetMethod.scala index 2b842908a0..7b63954cb9 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateSetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegateSetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_DELEGATION, JMAP_CORE} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} import org.apache.james.jmap.core.{ClientId, Id, Invocation, ServerId, SessionTranslator, UuidState} @@ -31,8 +32,6 @@ import org.apache.james.mailbox.MailboxSession.isPrimaryAccount import org.apache.james.metrics.api.MetricFactory import reactor.core.scala.publisher.SMono -import javax.inject.Inject - class DelegateSetMethod @Inject()(createPerformer: DelegateSetCreatePerformer, deletePerformer: DelegateSetDeletePerformer, val metricFactory: MetricFactory, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegatedAccountGetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegatedAccountGetMethod.scala index 2e43eb916b..a3181bb8fc 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegatedAccountGetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegatedAccountGetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.core.Username import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_DELEGATION, JMAP_CORE} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} @@ -34,7 +35,6 @@ import org.reactivestreams.Publisher import play.api.libs.json.JsObject import reactor.core.scala.publisher.{SFlux, SMono} -import javax.inject.Inject import scala.jdk.OptionConverters._ class DelegatedAccountGetMethod @Inject()(val metricFactory: MetricFactory, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegatedAccountSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegatedAccountSetMethod.scala index c8fbfe44bd..a342000c6d 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegatedAccountSetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/DelegatedAccountSetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_DELEGATION, JMAP_CORE} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} import org.apache.james.jmap.core.{Invocation, SessionTranslator, UuidState} @@ -31,8 +32,6 @@ import org.apache.james.mailbox.MailboxSession.isPrimaryAccount import org.apache.james.metrics.api.MetricFactory import reactor.core.scala.publisher.SMono -import javax.inject.Inject - class DelegatedAccountSetMethod @Inject()(deletePerformer: DelegatedAccountDeletePerformer, val metricFactory: MetricFactory, val sessionSupplier: SessionSupplier, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailChangesMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailChangesMethod.scala index 4b9913bbeb..e877aa0470 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailChangesMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailChangesMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.api.change.{CanNotCalculateChangesException, EmailChangeRepository, EmailChanges, State => JavaState} import org.apache.james.jmap.api.model.{AccountId => JavaAccountId} import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_SHARES, JMAP_MAIL} @@ -32,7 +33,6 @@ import org.apache.james.mailbox.MailboxSession import org.apache.james.metrics.api.MetricFactory import reactor.core.scala.publisher.SMono -import javax.inject.Inject import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailGetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailGetMethod.scala index e5d420c09c..eb2c01c36d 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailGetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailGetMethod.scala @@ -18,7 +18,10 @@ ****************************************************************/ package org.apache.james.jmap.method +import java.time.ZoneId + import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.api.change.{EmailChangeRepository, State => JavaState} import org.apache.james.jmap.api.model.{AccountId => JavaAccountId} import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_SHARES, JMAP_CORE, JMAP_MAIL} @@ -35,9 +38,6 @@ import org.slf4j.{Logger, LoggerFactory} import play.api.libs.json.JsObject import reactor.core.scala.publisher.{SFlux, SMono} -import java.time.ZoneId -import javax.inject.Inject - object EmailGetResults { private val logger: Logger = LoggerFactory.getLogger(classOf[EmailGetResults]) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailImportMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailImportMethod.scala index d2da447b39..3b5198ef54 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailImportMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailImportMethod.scala @@ -19,7 +19,10 @@ package org.apache.james.jmap.method +import java.util.Date + import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.api.change.EmailChangeRepository import org.apache.james.jmap.api.model.Size.sanitizeSize import org.apache.james.jmap.api.model.{AccountId => JavaAccountId} @@ -43,8 +46,6 @@ import org.apache.james.util.ReactorUtils import org.reactivestreams.Publisher import reactor.core.scala.publisher.{SFlux, SMono} -import java.util.Date -import javax.inject.Inject import scala.util.{Try, Using} object EmailImportMethod { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailParseMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailParseMethod.scala index 2e89d3cc79..291f0a844b 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailParseMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailParseMethod.scala @@ -19,7 +19,10 @@ package org.apache.james.jmap.method +import java.io.InputStream + import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.api.model.Preview import org.apache.james.jmap.api.model.Size.Size import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_MAIL} @@ -34,8 +37,6 @@ import org.apache.james.util.html.HtmlTextExtractor import play.api.libs.json.JsObject import reactor.core.scala.publisher.{SFlux, SMono} -import java.io.InputStream -import javax.inject.Inject import scala.util.Try class EmailParseMethod @Inject()(val blobResolvers: BlobResolvers, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailQueryMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailQueryMethod.scala index d31424ba19..f31f454c4a 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailQueryMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailQueryMethod.scala @@ -18,8 +18,12 @@ ****************************************************************/ package org.apache.james.jmap.method +import java.time.ZonedDateTime + import cats.implicits._ import eu.timepit.refined.auto._ +import javax.inject.Inject +import javax.mail.Flags.Flag.DELETED import org.apache.james.jmap.JMAPConfiguration import org.apache.james.jmap.api.projections.EmailQueryView import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_MAIL} @@ -40,9 +44,6 @@ import org.apache.james.metrics.api.MetricFactory import org.apache.james.util.streams.{Limit => JavaLimit} import reactor.core.scala.publisher.{SFlux, SMono} -import java.time.ZonedDateTime -import javax.inject.Inject -import javax.mail.Flags.Flag.DELETED import scala.jdk.CollectionConverters._ class EmailQueryMethod @Inject() (serializer: EmailQuerySerializer, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala index 4bdef7d354..b6f0e7eef2 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala @@ -19,6 +19,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.api.change.EmailChangeRepository import org.apache.james.jmap.api.model.{AccountId => JavaAccountId} import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_SHARES, JMAP_CORE, JMAP_MAIL} @@ -32,8 +33,6 @@ import org.apache.james.mailbox.model.MessageId import org.apache.james.metrics.api.MetricFactory import reactor.core.scala.publisher.SMono -import javax.inject.Inject - case class MessageNotFoundException(messageId: MessageId) extends Exception class EmailSetMethod @Inject()(serializer: EmailSetSerializer, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSubmissionSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSubmissionSetMethod.scala index 7bbbf6597a..3dff76ecbc 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSubmissionSetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSubmissionSetMethod.scala @@ -19,9 +19,16 @@ package org.apache.james.jmap.method +import java.io.InputStream + import cats.implicits._ import eu.timepit.refined.auto._ import eu.timepit.refined.refineV +import javax.annotation.PreDestroy +import javax.inject.Inject +import javax.mail.Address +import javax.mail.Message.RecipientType +import javax.mail.internet.{InternetAddress, MimeMessage} import org.apache.james.core.{MailAddress, Username} import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, EMAIL_SUBMISSION, JMAP_CORE} import org.apache.james.jmap.core.Id.{Id, IdConstraint} @@ -47,12 +54,6 @@ import reactor.core.scala.publisher.{SFlux, SMono} import reactor.core.scheduler.Schedulers import reactor.util.concurrent.Queues -import java.io.InputStream -import javax.annotation.PreDestroy -import javax.inject.Inject -import javax.mail.Address -import javax.mail.Message.RecipientType -import javax.mail.internet.{InternetAddress, MimeMessage} import scala.jdk.CollectionConverters._ import scala.util.{Failure, Success, Try} diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentityChangesMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentityChangesMethod.scala index 3a7a44ed27..bcc977bcb6 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentityChangesMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentityChangesMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, EMAIL_SUBMISSION} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} import org.apache.james.jmap.core.{ErrorCode, Invocation, SessionTranslator, UuidState} @@ -31,8 +32,6 @@ import org.apache.james.metrics.api.MetricFactory import org.reactivestreams.Publisher import reactor.core.scala.publisher.SMono -import javax.inject.Inject - class IdentityChangesMethod @Inject()(val metricFactory: MetricFactory, val sessionSupplier: SessionSupplier, val sessionTranslator: SessionTranslator) extends MethodRequiringAccountId[IdentityChangesRequest] { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentityGetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentityGetMethod.scala index 4a4ef37ee7..382ab49c6a 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentityGetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentityGetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.api.identity.IdentityRepository import org.apache.james.jmap.api.model.{Identity, IdentityId} import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, EMAIL_SUBMISSION, JMAP_CORE} @@ -34,8 +35,6 @@ import org.apache.james.util.ReactorUtils import play.api.libs.json.JsObject import reactor.core.scala.publisher.{SFlux, SMono} -import javax.inject.Inject - class IdentityGetMethod @Inject() (identityRepository: IdentityRepository, val metricFactory: MetricFactory, val sessionSupplier: SessionSupplier, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentitySetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentitySetMethod.scala index b885c3ab59..08ccf16212 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentitySetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/IdentitySetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, EMAIL_SUBMISSION, JMAP_CORE} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} import org.apache.james.jmap.core.{ClientId, Id, Invocation, ServerId, SessionTranslator, UuidState} @@ -30,8 +31,6 @@ import org.apache.james.mailbox.MailboxSession import org.apache.james.metrics.api.MetricFactory import reactor.core.scala.publisher.SMono -import javax.inject.Inject - class IdentitySetMethod @Inject()(createPerformer: IdentitySetCreatePerformer, updatePerformer: IdentitySetUpdatePerformer, deletePerformer: IdentitySetDeletePerformer, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MDNParseMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MDNParseMethod.scala index 72bf5b5947..baff8d92da 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MDNParseMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MDNParseMethod.scala @@ -19,7 +19,10 @@ package org.apache.james.jmap.method +import java.io.InputStream + import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_MAIL, JMAP_MDN} import org.apache.james.jmap.core.Invocation._ import org.apache.james.jmap.core.{Invocation, SessionTranslator} @@ -36,8 +39,6 @@ import org.apache.james.mime4j.message.DefaultMessageBuilder import play.api.libs.json.JsObject import reactor.core.scala.publisher.{SFlux, SMono} -import java.io.InputStream -import javax.inject.Inject import scala.jdk.OptionConverters._ import scala.util.{Try, Using} diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MDNSendMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MDNSendMethod.scala index 143547ca6f..a19e37dc43 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MDNSendMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MDNSendMethod.scala @@ -20,6 +20,9 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.annotation.PreDestroy +import javax.inject.Inject +import javax.mail.internet.MimeMessage import org.apache.james.jmap.api.model.Identity import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_MAIL, JMAP_MDN} import org.apache.james.jmap.core.Invocation._ @@ -48,9 +51,6 @@ import org.apache.james.util.ReactorUtils import play.api.libs.json.{JsError, JsObject, JsSuccess} import reactor.core.scala.publisher.{SFlux, SMono} -import javax.annotation.PreDestroy -import javax.inject.Inject -import javax.mail.internet.MimeMessage import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ import scala.util.Try diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxChangesMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxChangesMethod.scala index b65b4fc1f3..8c80953151 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxChangesMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxChangesMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.api.change.{CanNotCalculateChangesException, MailboxChangeRepository, MailboxChanges, State => JavaState} import org.apache.james.jmap.api.model.{AccountId => JavaAccountId} import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_MAIL} @@ -33,7 +34,6 @@ import org.apache.james.mailbox.MailboxSession import org.apache.james.metrics.api.MetricFactory import reactor.core.scala.publisher.SMono -import javax.inject.Inject import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxGetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxGetMethod.scala index bacbf3a1f6..d78c5ace6a 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxGetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxGetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.api.change.MailboxChangeRepository import org.apache.james.jmap.api.model.{AccountId => JavaAccountId} import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_SHARES, JMAP_CORE, JMAP_MAIL} @@ -38,7 +39,6 @@ import org.apache.james.metrics.api.MetricFactory import play.api.libs.json.JsObject import reactor.core.scala.publisher.{SFlux, SMono} -import javax.inject.Inject import scala.util.Try object MailboxGetResults { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxQueryMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxQueryMethod.scala index 27a8cdd8ae..883f91fdf7 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxQueryMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxQueryMethod.scala @@ -19,6 +19,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_MAIL} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} import org.apache.james.jmap.core.{CanCalculateChanges, ErrorCode, Invocation, Limit, Position, QueryState, SessionTranslator} @@ -29,8 +30,6 @@ import org.apache.james.mailbox.{MailboxSession, SystemMailboxesProvider} import org.apache.james.metrics.api.MetricFactory import reactor.core.scala.publisher.{SFlux, SMono} -import javax.inject.Inject - class MailboxQueryMethod @Inject()(systemMailboxesProvider: SystemMailboxesProvider, val metricFactory: MetricFactory, val sessionSupplier: SessionSupplier, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxSetMethod.scala index f5d16fcaad..2de517584b 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxSetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/MailboxSetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.api.change.MailboxChangeRepository import org.apache.james.jmap.api.model.{AccountId => JavaAccountId} import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_SHARES, JMAP_CORE, JMAP_MAIL} @@ -37,8 +38,6 @@ import org.apache.james.metrics.api.MetricFactory import play.api.libs.json.JsObject import reactor.core.scala.publisher.SMono -import javax.inject.Inject - case class MailboxHasMailException(mailboxId: MailboxId) extends Exception case class SystemMailboxChangeException(mailboxId: MailboxId) extends Exception case class LoopInMailboxGraphException(mailboxId: MailboxId) extends Exception diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionGetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionGetMethod.scala index bdb24de165..8fe02c250f 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionGetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionGetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.api.model.PushSubscriptionId import org.apache.james.jmap.api.pushsubscription.PushSubscriptionRepository import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE} @@ -33,7 +34,6 @@ import org.apache.james.metrics.api.MetricFactory import play.api.libs.json.JsObject import reactor.core.scala.publisher.{SFlux, SMono} -import javax.inject.Inject import scala.jdk.CollectionConverters._ case class PushSubscriptionGetResults(results: Seq[PushSubscriptionDTO], notFound: Set[UnparsedPushSubscriptionId]) { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionSetMethod.scala index ee758cdf6f..b5157e1e06 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionSetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/PushSubscriptionSetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} import org.apache.james.jmap.core.{Invocation, PushSubscriptionSetRequest, PushSubscriptionSetResponse, SessionTranslator} @@ -30,8 +31,6 @@ import org.apache.james.mailbox.MailboxSession import org.apache.james.metrics.api.MetricFactory import reactor.core.scala.publisher.SMono -import javax.inject.Inject - class PushSubscriptionSetMethod @Inject()(createPerformer: PushSubscriptionSetCreatePerformer, updatePerformer: PushSubscriptionUpdatePerformer, deletePerformer: PushSubscriptionSetDeletePerformer, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaChangesMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaChangesMethod.scala index 8e7fe530c9..b4cf63e79e 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaChangesMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaChangesMethod.scala @@ -21,6 +21,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.core.Username import org.apache.james.jmap.api.change.CanNotCalculateChangesException import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_QUOTA} @@ -36,8 +37,6 @@ import org.apache.james.metrics.api.MetricFactory import org.reactivestreams.Publisher import reactor.core.scala.publisher.SMono -import javax.inject.Inject - class QuotaChangesMethod @Inject()(val metricFactory: MetricFactory, val sessionSupplier: SessionSupplier, val sessionTranslator: SessionTranslator, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaGetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaGetMethod.scala index c659a22049..9e8ea70acc 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaGetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaGetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.core.Username import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_SHARES, JMAP_CORE, JMAP_QUOTA} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} @@ -37,8 +38,6 @@ import org.reactivestreams.Publisher import play.api.libs.json.JsObject import reactor.core.scala.publisher.{SFlux, SMono} -import javax.inject.Inject - class QuotaGetMethod @Inject()(val metricFactory: MetricFactory, val sessionSupplier: SessionSupplier, val sessionTranslator: SessionTranslator, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaQueryMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaQueryMethod.scala index 8d32198587..5592641450 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaQueryMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/QuotaQueryMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_QUOTA} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} import org.apache.james.jmap.core.{CanCalculateChanges, ErrorCode, Invocation, Limit, Position, QueryState, SessionTranslator} @@ -32,8 +33,6 @@ import org.apache.james.metrics.api.MetricFactory import org.reactivestreams.Publisher import reactor.core.scala.publisher.SMono -import javax.inject.Inject - class QuotaQueryMethod @Inject()(val metricFactory: MetricFactory, val sessionSupplier: SessionSupplier, val sessionTranslator: SessionTranslator, diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/ThreadChangesMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/ThreadChangesMethod.scala index 0266f05b45..26a7c26a28 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/ThreadChangesMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/ThreadChangesMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_MAIL} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} import org.apache.james.jmap.core.{ErrorCode, Invocation, SessionTranslator, UuidState} @@ -30,8 +31,6 @@ import org.apache.james.mailbox.MailboxSession import org.apache.james.metrics.api.MetricFactory import reactor.core.scala.publisher.SMono -import javax.inject.Inject - class ThreadChangesMethod @Inject()(val metricFactory: MetricFactory, val sessionSupplier: SessionSupplier, val sessionTranslator: SessionTranslator) extends MethodRequiringAccountId[ThreadChangesRequest] { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/ThreadGetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/ThreadGetMethod.scala index daee568bda..07869d1bda 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/ThreadGetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/ThreadGetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_MAIL} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} import org.apache.james.jmap.core.{AccountId, Invocation, SessionTranslator, UuidState} @@ -32,7 +33,6 @@ import org.apache.james.mailbox.{MailboxManager, MailboxSession} import org.apache.james.metrics.api.MetricFactory import reactor.core.scala.publisher.{SFlux, SMono} -import javax.inject.Inject import scala.util.Try object ThreadGetResult { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseGetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseGetMethod.scala index a07c9384c8..c7e2006750 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseGetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseGetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.Inject import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_VACATION_RESPONSE} import org.apache.james.jmap.core.Invocation.{Arguments, MethodName} import org.apache.james.jmap.core.UuidState.INSTANCE @@ -34,8 +35,6 @@ import org.apache.james.vacation.api.{VacationService, AccountId => JavaAccountI import play.api.libs.json.JsObject import reactor.core.scala.publisher.{SFlux, SMono} -import javax.inject.Inject - object VacationResponseGetResult { def empty: VacationResponseGetResult = VacationResponseGetResult(Set.empty, VacationResponseNotFound(Set.empty)) def merge(result1: VacationResponseGetResult, result2: VacationResponseGetResult): VacationResponseGetResult = result1.merge(result2) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseSetMethod.scala index 813938beaa..14ff1eb934 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseSetMethod.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/VacationResponseSetMethod.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ +import javax.inject.{Inject, Named} import org.apache.james.events.Event.EventId import org.apache.james.events.EventBus import org.apache.james.jmap.InjectionKeys @@ -39,8 +40,6 @@ import org.apache.james.vacation.api.{VacationPatch, VacationService, AccountId import play.api.libs.json.JsObject import reactor.core.scala.publisher.{SFlux, SMono} -import javax.inject.{Inject, Named} - object VacationResponseUpdateResults { def empty(): VacationResponseUpdateResults = VacationResponseUpdateResults(Map(), Map()) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/DownloadRoutes.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/DownloadRoutes.scala index 63ca6c1ccd..c1cda471bc 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/DownloadRoutes.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/DownloadRoutes.scala @@ -42,7 +42,7 @@ import org.apache.james.jmap.exceptions.UnauthorizedException import org.apache.james.jmap.http.Authenticator import org.apache.james.jmap.http.rfc8621.InjectionKeys import org.apache.james.jmap.json.ResponseSerializer -import org.apache.james.jmap.mail.{BlobId, EmailBodyPart, PartId} +import org.apache.james.jmap.mail.{BlobId, EmailBodyPart} import org.apache.james.jmap.method.{AccountNotFoundException, ZoneIdProvider} import org.apache.james.jmap.routes.DownloadRoutes.{BUFFER_SIZE, LOGGER} import org.apache.james.jmap.{Endpoint, JMAPRoute, JMAPRoutes} diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/ProcessingContext.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/ProcessingContext.scala index 731ca10225..0c01fb14d9 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/ProcessingContext.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/ProcessingContext.scala @@ -27,10 +27,10 @@ import org.apache.james.jmap.core.{ClientId, Id, Invocation, ServerId} import org.apache.james.jmap.json.BackReferenceDeserializer import play.api.libs.json.{JsArray, JsError, JsObject, JsResult, JsString, JsSuccess, JsValue, Reads} -import scala.util.Try import scala.collection.IndexedSeq import scala.collection.Map import scala.collection.immutable.{Map => ImmutableMap} +import scala.util.Try sealed trait JsonPathPart diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionRoutes.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionRoutes.scala index 49142fc021..83359d9287 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionRoutes.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionRoutes.scala @@ -19,9 +19,13 @@ package org.apache.james.jmap.routes +import java.nio.charset.StandardCharsets +import java.util.stream.Stream + import io.netty.handler.codec.http.HttpHeaderNames.{CONTENT_LENGTH, CONTENT_TYPE} import io.netty.handler.codec.http.HttpResponseStatus.{BAD_REQUEST, INTERNAL_SERVER_ERROR, OK, UNAUTHORIZED} import io.netty.handler.codec.http.{HttpMethod, HttpResponseStatus} +import javax.inject.{Inject, Named} import org.apache.commons.lang3.tuple.Pair import org.apache.james.core.Username import org.apache.james.jmap.HttpConstants.{JSON_CONTENT_TYPE, JSON_CONTENT_TYPE_UTF8} @@ -41,9 +45,6 @@ import reactor.core.publisher.Mono import reactor.core.scala.publisher.{SFlux, SMono} import reactor.netty.http.server.HttpServerResponse -import java.nio.charset.StandardCharsets -import java.util.stream.Stream -import javax.inject.{Inject, Named} import scala.jdk.OptionConverters._ object SessionRoutes { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionSupplier.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionSupplier.scala index bc97ffee09..0ff832779a 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionSupplier.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionSupplier.scala @@ -19,15 +19,16 @@ package org.apache.james.jmap.routes +import java.net.URL + import cats.data.Validated import cats.implicits.toTraverseOps import cats.instances.list._ +import javax.inject.Inject import org.apache.james.core.Username import org.apache.james.jmap.core.CapabilityIdentifier.CapabilityIdentifier import org.apache.james.jmap.core.{Account, AccountId, Capabilities, Capability, CapabilityFactory, IsPersonal, IsReadOnly, Session, UrlPrefixes} -import java.net.URL -import javax.inject.Inject import scala.jdk.CollectionConverters._ class SessionSupplier(capabilityFactories: Set[CapabilityFactory]) { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/UploadRoutes.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/UploadRoutes.scala index 7c99951c2c..2c42f2a62b 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/UploadRoutes.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/UploadRoutes.scala @@ -24,10 +24,10 @@ import java.nio.ByteBuffer import java.nio.charset.StandardCharsets import java.util.stream import java.util.stream.Stream + import io.netty.handler.codec.http.HttpHeaderNames.{CONTENT_LENGTH, CONTENT_TYPE} import io.netty.handler.codec.http.HttpResponseStatus.{BAD_REQUEST, CREATED, FORBIDDEN, INTERNAL_SERVER_ERROR, UNAUTHORIZED} import io.netty.handler.codec.http.{HttpMethod, HttpResponseStatus} - import javax.inject.{Inject, Named} import org.apache.commons.fileupload.util.LimitedInputStream import org.apache.james.jmap.HttpConstants.JSON_CONTENT_TYPE diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/vacation/VacationResponseSet.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/vacation/VacationResponseSet.scala index 5fe7428e36..7470d8aac2 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/vacation/VacationResponseSet.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/vacation/VacationResponseSet.scala @@ -21,11 +21,12 @@ package org.apache.james.jmap.vacation import java.time.ZonedDateTime import java.time.format.DateTimeFormatter -import org.apache.james.vacation.api.Vacation.ID + import org.apache.james.jmap.core.SetError.{SetErrorDescription, SetErrorType, invalidArgumentValue, serverFailValue} import org.apache.james.jmap.core.{AccountId, UuidState} import org.apache.james.jmap.method.WithAccountId import org.apache.james.util.ValuePatch +import org.apache.james.vacation.api.Vacation.ID import org.apache.james.vacation.api.VacationPatch import play.api.libs.json.{JsBoolean, JsNull, JsObject, JsString, JsValue} diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala index 528dacffb4..82bf5c7040 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/MailboxChangeListenerTest.scala @@ -19,6 +19,10 @@ package org.apache.james.jmap.change +import java.time.{Clock, ZonedDateTime} +import java.util + +import javax.mail.Flags import org.apache.james.events.delivery.InVmEventDelivery import org.apache.james.events.{Event, EventBus, EventBusName, EventListener, Group, InVMEventBus, MemoryEventDeadLetters, Registration, RegistrationKey, RetryBackoffConfiguration} import org.apache.james.jmap.api.change.{EmailChange, EmailChangeRepository, Limit, MailboxAndEmailChange, MailboxChange, MailboxChangeRepository, State} @@ -37,9 +41,6 @@ import org.junit.jupiter.api.{BeforeEach, Nested, Test} import org.reactivestreams.Publisher import reactor.core.publisher.Mono -import java.time.{Clock, ZonedDateTime} -import java.util -import javax.mail.Flags import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/StateChangeListenerTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/StateChangeListenerTest.scala index 7961be4299..7aa5bcca44 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/StateChangeListenerTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/StateChangeListenerTest.scala @@ -26,8 +26,6 @@ import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import reactor.core.publisher.Sinks import reactor.core.publisher.Sinks.EmitFailureHandler -import reactor.core.scala.publisher.SMono -import reactor.core.scheduler.Schedulers class StateChangeListenerTest { private val mailboxState = UuidState.fromStringUnchecked("2f9f1b12-b35a-43e6-9af2-0106fb53a943") diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/UserCredentialParserTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/UserCredentialParserTest.scala index 797a4cb099..1b7446943d 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/UserCredentialParserTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/UserCredentialParserTest.scala @@ -19,15 +19,15 @@ package org.apache.james.jmap.http +import java.nio.charset.StandardCharsets +import java.util.Base64 + import org.apache.james.core.Username import org.apache.james.jmap.exceptions.UnauthorizedException import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Assertions.assertThrows import org.junit.jupiter.api.Test -import java.nio.charset.StandardCharsets -import java.util.Base64 - class UserCredentialParserTest { @Test def shouldReturnCredentialWhenUsernamePasswordToken(): Unit = { diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/PushSerializerTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/PushSerializerTest.scala index 0fcbf23ac2..312c949b57 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/PushSerializerTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/PushSerializerTest.scala @@ -19,14 +19,14 @@ package org.apache.james.jmap.json +import java.util.UUID + import org.apache.james.jmap.api.model.{PushSubscriptionId, VerificationCode} import org.apache.james.jmap.method.PushVerification import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import play.api.libs.json.{JsValue, Json} -import java.util.UUID - class PushSerializerTest extends AnyWordSpec with Matchers { "Serialize PushVerification" should { diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala index 8de94e18ee..57650bf80d 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala @@ -20,6 +20,7 @@ package org.apache.james.jmap.routes import java.nio.charset.StandardCharsets + import io.netty.handler.codec.http.HttpHeaderNames.ACCEPT import io.restassured.RestAssured import io.restassured.builder.RequestSpecBuilder --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org For additional commands, e-mail: notifications-h...@james.apache.org