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
commit 7622c3f6f9b1cbcf0a07125e3f4d2cd02d36868e Author: Benoit Tellier <[email protected]> AuthorDate: Mon Nov 2 10:07:08 2020 +0700 [REFACTORING] Relocate SessionRoutes in toutes package --- .../java/org/apache/james/jmap/rfc8621/RFC8621MethodsModule.java | 2 +- .../src/main/scala/org/apache/james/jmap/method/EmailGetMethod.scala | 2 +- .../main/scala/org/apache/james/jmap/method/EmailQueryMethod.scala | 2 +- .../src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala | 2 +- .../main/scala/org/apache/james/jmap/method/MailboxGetMethod.scala | 2 +- .../main/scala/org/apache/james/jmap/method/MailboxQueryMethod.scala | 2 +- .../main/scala/org/apache/james/jmap/method/MailboxSetMethod.scala | 3 +-- .../src/main/scala/org/apache/james/jmap/method/Method.scala | 4 +--- .../org/apache/james/jmap/method/VacationResponseGetMethod.scala | 2 +- .../org/apache/james/jmap/method/VacationResponseSetMethod.scala | 2 +- .../src/main/scala/org/apache/james/jmap/routes/JMAPApiRoutes.scala | 2 +- .../scala/org/apache/james/jmap/{http => routes}/SessionRoutes.scala | 4 ++-- .../org/apache/james/jmap/{http => routes}/SessionSupplier.scala | 2 +- .../test/scala/org/apache/james/jmap/routes/JMAPApiRoutesTest.scala | 2 +- .../org/apache/james/jmap/{http => routes}/SessionRoutesTest.scala | 5 +++-- .../org/apache/james/jmap/{http => routes}/SessionSupplierTest.scala | 4 ++-- 16 files changed, 20 insertions(+), 22 deletions(-) diff --git a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/rfc8621/RFC8621MethodsModule.java b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/rfc8621/RFC8621MethodsModule.java index d8c2771..f2c599b 100644 --- a/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/rfc8621/RFC8621MethodsModule.java +++ b/server/container/guice/protocols/jmap/src/main/java/org/apache/james/jmap/rfc8621/RFC8621MethodsModule.java @@ -30,7 +30,6 @@ import org.apache.james.jmap.JMAPRoutesHandler; import org.apache.james.jmap.Version; import org.apache.james.jmap.http.Authenticator; import org.apache.james.jmap.http.BasicAuthenticationStrategy; -import org.apache.james.jmap.http.SessionRoutes; import org.apache.james.jmap.http.rfc8621.InjectionKeys; import org.apache.james.jmap.jwt.JWTAuthenticationStrategy; import org.apache.james.jmap.method.CoreEchoMethod; @@ -48,6 +47,7 @@ import org.apache.james.jmap.method.ZoneIdProvider; import org.apache.james.jmap.model.JmapRfc8621Configuration; import org.apache.james.jmap.routes.DownloadRoutes; import org.apache.james.jmap.routes.JMAPApiRoutes; +import org.apache.james.jmap.routes.SessionRoutes; import org.apache.james.jmap.routes.UploadRoutes; import org.apache.james.metrics.api.MetricFactory; import org.apache.james.utils.PropertiesProvider; 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 5201c5a..734a6ba 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 @@ -23,7 +23,6 @@ import java.time.ZoneId import eu.timepit.refined.auto._ import eu.timepit.refined.types.string.NonEmptyString import javax.inject.Inject -import org.apache.james.jmap.http.SessionSupplier import org.apache.james.jmap.json.{EmailGetSerializer, ResponseSerializer} import org.apache.james.jmap.mail.Email.UnparsedEmailId import org.apache.james.jmap.mail.{Email, EmailBodyPart, EmailGetRequest, EmailGetResponse, EmailIds, EmailNotFound, EmailView, EmailViewReaderFactory, SpecificHeaderRequest} @@ -31,6 +30,7 @@ import org.apache.james.jmap.model.CapabilityIdentifier.{CapabilityIdentifier, J import org.apache.james.jmap.model.Invocation.{Arguments, MethodName} import org.apache.james.jmap.model.State.INSTANCE import org.apache.james.jmap.model.{AccountId, ErrorCode, Invocation, Properties} +import org.apache.james.jmap.routes.SessionSupplier import org.apache.james.mailbox.MailboxSession import org.apache.james.mailbox.model.MessageId import org.apache.james.metrics.api.MetricFactory 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 06fa529..da20d5f 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 @@ -21,7 +21,6 @@ package org.apache.james.jmap.method import cats.implicits._ import eu.timepit.refined.auto._ import javax.inject.Inject -import org.apache.james.jmap.http.SessionSupplier import org.apache.james.jmap.json.{EmailQuerySerializer, ResponseSerializer} import org.apache.james.jmap.mail.{Comparator, EmailQueryRequest, EmailQueryResponse, UnsupportedRequestParameterException} import org.apache.james.jmap.model.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_MAIL} @@ -29,6 +28,7 @@ import org.apache.james.jmap.model.Invocation.{Arguments, MethodName} import org.apache.james.jmap.model.Limit.Limit import org.apache.james.jmap.model.Position.Position import org.apache.james.jmap.model.{CanCalculateChanges, Invocation, Limit, Position, QueryState} +import org.apache.james.jmap.routes.SessionSupplier import org.apache.james.jmap.utils.search.MailboxFilter import org.apache.james.jmap.utils.search.MailboxFilter.QueryFilter import org.apache.james.mailbox.model.MultimailboxesSearchQuery 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 bdf9722..c1f87fc 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 @@ -26,7 +26,6 @@ import com.google.common.collect.ImmutableList import eu.timepit.refined.auto._ import javax.inject.Inject import javax.mail.Flags -import org.apache.james.jmap.http.SessionSupplier import org.apache.james.jmap.json.{EmailSetSerializer, ResponseSerializer} import org.apache.james.jmap.mail.EmailSet.{EmailCreationId, UnparsedMessageId} import org.apache.james.jmap.mail.{DestroyIds, EmailCreationRequest, EmailCreationResponse, EmailSet, EmailSetRequest, EmailSetResponse, MailboxIds, ValidatedEmailSetUpdate} @@ -35,6 +34,7 @@ import org.apache.james.jmap.model.Invocation.{Arguments, MethodName} import org.apache.james.jmap.model.KeywordsFactory.LENIENT_KEYWORDS_FACTORY import org.apache.james.jmap.model.SetError.SetErrorDescription import org.apache.james.jmap.model.{ClientId, Id, Invocation, ServerId, SetError, State, UTCDate} +import org.apache.james.jmap.routes.SessionSupplier import org.apache.james.mailbox.MessageManager.{AppendCommand, FlagsUpdateMode} import org.apache.james.mailbox.exception.MailboxNotFoundException import org.apache.james.mailbox.model.{ComposedMessageIdWithMetaData, DeleteResult, MailboxId, MessageId, MessageRange} 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 0b41593..ba5baa2 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 @@ -21,7 +21,6 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ import javax.inject.Inject -import org.apache.james.jmap.http.SessionSupplier import org.apache.james.jmap.json.{MailboxSerializer, ResponseSerializer} import org.apache.james.jmap.mail.MailboxGet.UnparsedMailboxId import org.apache.james.jmap.mail._ @@ -29,6 +28,7 @@ import org.apache.james.jmap.model.CapabilityIdentifier.{CapabilityIdentifier, J import org.apache.james.jmap.model.Invocation.{Arguments, MethodName} import org.apache.james.jmap.model.State.INSTANCE import org.apache.james.jmap.model.{AccountId, CapabilityIdentifier, ErrorCode, Invocation, MailboxFactory, Properties, Subscriptions} +import org.apache.james.jmap.routes.SessionSupplier import org.apache.james.jmap.utils.quotas.{QuotaLoader, QuotaLoaderWithPreloadedDefaultFactory} import org.apache.james.mailbox.exception.MailboxNotFoundException import org.apache.james.mailbox.model.search.MailboxQuery 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 d390d0f..2c3d5a8 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 @@ -20,12 +20,12 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ import javax.inject.Inject -import org.apache.james.jmap.http.SessionSupplier import org.apache.james.jmap.json.{MailboxQuerySerializer, ResponseSerializer} import org.apache.james.jmap.mail.{MailboxQueryRequest, MailboxQueryResponse} import org.apache.james.jmap.model.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_MAIL} import org.apache.james.jmap.model.Invocation.{Arguments, MethodName} import org.apache.james.jmap.model._ +import org.apache.james.jmap.routes.SessionSupplier import org.apache.james.mailbox.{MailboxSession, SystemMailboxesProvider} import org.apache.james.metrics.api.MetricFactory import play.api.libs.json.{JsError, JsSuccess} 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 ff59c84..d5ab55d 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 @@ -21,7 +21,6 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ import javax.inject.Inject -import org.apache.james.jmap.http.SessionSupplier import org.apache.james.jmap.json.{MailboxSerializer, ResponseSerializer} import org.apache.james.jmap.mail.MailboxGet.UnparsedMailboxId import org.apache.james.jmap.mail.MailboxSetRequest.MailboxCreationId @@ -30,7 +29,7 @@ import org.apache.james.jmap.model.CapabilityIdentifier.{CapabilityIdentifier, J import org.apache.james.jmap.model.Invocation.{Arguments, MethodName} import org.apache.james.jmap.model.SetError.SetErrorDescription import org.apache.james.jmap.model.{ClientId, Id, Invocation, Properties, ServerId, SetError, State} -import org.apache.james.jmap.routes.ProcessingContext +import org.apache.james.jmap.routes.{ProcessingContext, SessionSupplier} import org.apache.james.jmap.utils.quotas.QuotaLoaderWithPreloadedDefaultFactory import org.apache.james.mailbox.MailboxManager.RenameOption import org.apache.james.mailbox.exception.{InsufficientRightsException, MailboxExistsException, MailboxNameException, MailboxNotFoundException} diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/Method.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/Method.scala index c2e52d9..e14f870 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/Method.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/Method.scala @@ -18,13 +18,11 @@ ****************************************************************/ package org.apache.james.jmap.method - -import org.apache.james.jmap.http.SessionSupplier import org.apache.james.jmap.mail.{UnsupportedFilterException, UnsupportedNestingException, UnsupportedRequestParameterException, UnsupportedSortException} import org.apache.james.jmap.model.CapabilityIdentifier.CapabilityIdentifier import org.apache.james.jmap.model.Invocation.MethodName import org.apache.james.jmap.model.{AccountId, ErrorCode, Invocation, Session} -import org.apache.james.jmap.routes.ProcessingContext +import org.apache.james.jmap.routes.{ProcessingContext, SessionSupplier} import org.apache.james.mailbox.MailboxSession import org.apache.james.mailbox.exception.MailboxNotFoundException import org.apache.james.metrics.api.MetricFactory 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 05cbfdb..770443f 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 @@ -22,7 +22,6 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ import javax.inject.Inject import org.apache.james.jmap.api.vacation.{VacationRepository, AccountId => JavaAccountId} -import org.apache.james.jmap.http.SessionSupplier import org.apache.james.jmap.json.{ResponseSerializer, VacationSerializer} import org.apache.james.jmap.mail.VacationResponse.{UNPARSED_SINGLETON, UnparsedVacationResponseId} import org.apache.james.jmap.mail.{VacationResponse, VacationResponseGetRequest, VacationResponseGetResponse, VacationResponseNotFound} @@ -30,6 +29,7 @@ import org.apache.james.jmap.model.CapabilityIdentifier.{CapabilityIdentifier, J import org.apache.james.jmap.model.Invocation.{Arguments, MethodCallId, MethodName} import org.apache.james.jmap.model.State.INSTANCE import org.apache.james.jmap.model.{AccountId, ErrorCode, Invocation, MissingCapabilityException, Properties} +import org.apache.james.jmap.routes.SessionSupplier import org.apache.james.mailbox.MailboxSession import org.apache.james.metrics.api.MetricFactory import play.api.libs.json.{JsError, JsObject, JsSuccess} 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 c43978b..f7d2d0f 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 @@ -22,13 +22,13 @@ package org.apache.james.jmap.method import eu.timepit.refined.auto._ import javax.inject.Inject import org.apache.james.jmap.api.vacation.{AccountId, VacationPatch, VacationRepository} -import org.apache.james.jmap.http.SessionSupplier import org.apache.james.jmap.json.{ResponseSerializer, VacationSerializer} import org.apache.james.jmap.method.VacationResponseSetMethod.VACATION_RESPONSE_PATCH_OBJECT_KEY import org.apache.james.jmap.model.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE, JMAP_MAIL, JMAP_VACATION_RESPONSE} import org.apache.james.jmap.model.Invocation.{Arguments, MethodName} import org.apache.james.jmap.model.SetError.SetErrorDescription import org.apache.james.jmap.model.{Invocation, State} +import org.apache.james.jmap.routes.SessionSupplier import org.apache.james.jmap.vacation.{VacationResponseSetError, VacationResponseSetRequest, VacationResponseSetResponse, VacationResponseUpdateResponse} import org.apache.james.mailbox.MailboxSession import org.apache.james.metrics.api.MetricFactory diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/JMAPApiRoutes.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/JMAPApiRoutes.scala index d58912b..37d3d5d 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/JMAPApiRoutes.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/JMAPApiRoutes.scala @@ -33,7 +33,7 @@ import org.apache.james.jmap.HttpConstants.JSON_CONTENT_TYPE import org.apache.james.jmap.JMAPUrls.JMAP import org.apache.james.jmap.exceptions.UnauthorizedException import org.apache.james.jmap.http.rfc8621.InjectionKeys -import org.apache.james.jmap.http.{Authenticator, MailboxesProvisioner, SessionSupplier, UserProvisioning} +import org.apache.james.jmap.http.{Authenticator, MailboxesProvisioner, UserProvisioning} import org.apache.james.jmap.json.ResponseSerializer import org.apache.james.jmap.method.{InvocationWithContext, Method} import org.apache.james.jmap.model.CapabilityIdentifier.CapabilityIdentifier diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/http/SessionRoutes.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionRoutes.scala similarity index 97% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/http/SessionRoutes.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionRoutes.scala index 33e9598..a637cbc 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/http/SessionRoutes.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionRoutes.scala @@ -17,7 +17,7 @@ * under the License. * * ***************************************************************/ -package org.apache.james.jmap.http +package org.apache.james.jmap.routes import java.util.stream.Stream @@ -28,7 +28,7 @@ import javax.inject.{Inject, Named} import org.apache.james.jmap.HttpConstants.JSON_CONTENT_TYPE_UTF8 import org.apache.james.jmap.JMAPRoutes.CORS_CONTROL import org.apache.james.jmap.exceptions.UnauthorizedException -import org.apache.james.jmap.http.SessionRoutes.{JMAP_SESSION, LOGGER, WELL_KNOWN_JMAP} +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.model.Session diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/http/SessionSupplier.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionSupplier.scala similarity index 98% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/http/SessionSupplier.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionSupplier.scala index 0aa6bbc..2f6d12b 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/http/SessionSupplier.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/SessionSupplier.scala @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.http +package org.apache.james.jmap.routes import javax.inject.Inject import org.apache.james.core.Username diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/JMAPApiRoutesTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/JMAPApiRoutesTest.scala index 379a71f..dd2240a 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/JMAPApiRoutesTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/JMAPApiRoutesTest.scala @@ -36,7 +36,7 @@ import org.apache.james.dnsservice.api.DNSService import org.apache.james.domainlist.memory.MemoryDomainList import org.apache.james.jmap.JMAPUrls.JMAP import org.apache.james.jmap._ -import org.apache.james.jmap.http.{Authenticator, BasicAuthenticationStrategy, MailboxesProvisioner, SessionSupplier, UserProvisioning} +import org.apache.james.jmap.http.{Authenticator, BasicAuthenticationStrategy, MailboxesProvisioner, UserProvisioning} import org.apache.james.jmap.method.{CoreEchoMethod, Method} import org.apache.james.jmap.model.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE} import org.apache.james.jmap.model.Invocation.MethodName diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/SessionRoutesTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala similarity index 98% rename from server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/SessionRoutesTest.scala rename to server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala index 1f3083c..4c47291 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/SessionRoutesTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala @@ -17,7 +17,7 @@ * under the License. * * ***************************************************************/ -package org.apache.james.jmap.http +package org.apache.james.jmap.routes import java.nio.charset.StandardCharsets @@ -31,9 +31,10 @@ import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson import org.apache.http.HttpStatus import org.apache.james.core.Username import org.apache.james.jmap._ -import org.apache.james.jmap.http.SessionRoutesTest.{BOB, TEST_CONFIGURATION} +import org.apache.james.jmap.http.Authenticator import org.apache.james.jmap.model.JmapRfc8621Configuration import org.apache.james.jmap.model.JmapRfc8621Configuration.LOCALHOST_URL_PREFIX +import org.apache.james.jmap.routes.SessionRoutesTest.{BOB, TEST_CONFIGURATION} import org.apache.james.mailbox.MailboxSession import org.mockito.ArgumentMatchers.any import org.mockito.Mockito._ diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/SessionSupplierTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionSupplierTest.scala similarity index 95% rename from server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/SessionSupplierTest.scala rename to server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionSupplierTest.scala index 71f00d0..56e6a6d 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/SessionSupplierTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionSupplierTest.scala @@ -17,11 +17,11 @@ * under the License. * * ***************************************************************/ -package org.apache.james.jmap.http +package org.apache.james.jmap.routes import org.apache.james.core.Username -import org.apache.james.jmap.http.SessionSupplierTest.USERNAME import org.apache.james.jmap.model.JmapRfc8621Configuration +import org.apache.james.jmap.routes.SessionSupplierTest.USERNAME import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
