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 4aba016f117fe4ad5f69e540f66e0fcf427c69b3 Author: Rene Cordier <[email protected]> AuthorDate: Mon Nov 2 14:06:39 2020 +0700 [REFACTORING] Remove wildcards on some James scala imports --- .../src/main/scala/org/apache/james/jmap/json/EmailGetSerializer.scala | 2 +- .../main/scala/org/apache/james/jmap/json/MailboxQuerySerializer.scala | 2 +- .../src/main/scala/org/apache/james/jmap/json/MailboxSerializer.scala | 2 +- .../src/main/scala/org/apache/james/jmap/json/VacationSerializer.scala | 2 +- .../src/main/scala/org/apache/james/jmap/method/MailboxGetMethod.scala | 2 +- .../main/scala/org/apache/james/jmap/method/MailboxQueryMethod.scala | 2 +- .../src/main/scala/org/apache/james/jmap/routes/JMAPApiRoutes.scala | 2 +- .../src/main/scala/org/apache/james/jmap/routes/SessionSupplier.scala | 2 +- .../src/main/scala/org/apache/james/jmap/utils/quotas/QuotaReader.scala | 2 +- .../test/scala/org/apache/james/jmap/core/MailboxValidationTest.scala | 2 +- .../scala/org/apache/james/jmap/json/MailboxGetSerializationTest.scala | 2 +- .../scala/org/apache/james/jmap/json/SessionSerializationTest.scala | 2 +- .../src/test/scala/org/apache/james/jmap/routes/JMAPApiRoutesTest.scala | 2 +- .../src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/EmailGetSerializer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/EmailGetSerializer.scala index e24e728..fb89158 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/EmailGetSerializer.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/EmailGetSerializer.scala @@ -20,7 +20,7 @@ package org.apache.james.jmap.json import org.apache.james.jmap.api.model.Preview -import org.apache.james.jmap.core._ +import org.apache.james.jmap.core.Properties import org.apache.james.jmap.mail.{AddressesHeaderValue, BlobId, Charset, DateHeaderValue, Disposition, EmailAddress, EmailAddressGroup, EmailBody, EmailBodyMetadata, EmailBodyPart, EmailBodyValue, EmailFastView, EmailFullView, EmailGetRequest, EmailGetResponse, EmailHeader, EmailHeaderName, EmailHeaderValue, EmailHeaderView, EmailHeaders, EmailIds, EmailMetadata, EmailMetadataView, EmailNotFound, EmailView, EmailerName, FetchAllBodyValues, FetchHTMLBodyValues, FetchTextBodyValues, Group [...] import org.apache.james.mailbox.model.{Cid, MailboxId, MessageId} import play.api.libs.functional.syntax._ diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/MailboxQuerySerializer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/MailboxQuerySerializer.scala index d67c9a9..a10a316 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/MailboxQuerySerializer.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/MailboxQuerySerializer.scala @@ -19,7 +19,7 @@ package org.apache.james.jmap.json -import org.apache.james.jmap.core._ +import org.apache.james.jmap.core.{AccountId, CanCalculateChanges, QueryState} import org.apache.james.jmap.mail.{MailboxFilter, MailboxQueryRequest, MailboxQueryResponse} import org.apache.james.mailbox.Role import org.apache.james.mailbox.model.MailboxId diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/MailboxSerializer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/MailboxSerializer.scala index 28fcb34..8a0970e 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/MailboxSerializer.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/MailboxSerializer.scala @@ -24,7 +24,7 @@ import eu.timepit.refined.collection.NonEmpty import javax.inject.Inject import org.apache.james.core.{Domain, Username} import org.apache.james.jmap.core.CapabilityIdentifier.CapabilityIdentifier -import org.apache.james.jmap.core._ +import org.apache.james.jmap.core.{ClientId, Properties, SetError} import org.apache.james.jmap.mail.MailboxGet.{UnparsedMailboxId, UnparsedMailboxIdConstraint} import org.apache.james.jmap.mail.MailboxSetRequest.MailboxCreationId import org.apache.james.jmap.mail.{DelegatedNamespace, Ids, IsSubscribed, Mailbox, MailboxCreationRequest, MailboxCreationResponse, MailboxGetRequest, MailboxGetResponse, MailboxNamespace, MailboxPatchObject, MailboxRights, MailboxSetRequest, MailboxSetResponse, MailboxUpdateResponse, MayAddItems, MayCreateChild, MayDelete, MayReadItems, MayRemoveItems, MayRename, MaySetKeywords, MaySetSeen, MaySubmit, NotFound, PersonalNamespace, Quota, QuotaId, QuotaRoot, Quotas, RemoveEmailsOnDestroy, [...] diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/VacationSerializer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/VacationSerializer.scala index 2ee807e..3a3ecbd 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/VacationSerializer.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/VacationSerializer.scala @@ -21,7 +21,7 @@ package org.apache.james.jmap.json import java.time.format.DateTimeFormatter -import org.apache.james.jmap.core._ +import org.apache.james.jmap.core.{Properties, UTCDate} import org.apache.james.jmap.mail.Subject import org.apache.james.jmap.vacation.VacationResponse.{UnparsedVacationResponseId, VACATION_RESPONSE_ID} import org.apache.james.jmap.vacation.{FromDate, HtmlBody, IsEnabled, TextBody, ToDate, VacationResponse, VacationResponseGetRequest, VacationResponseGetResponse, VacationResponseId, VacationResponseIds, VacationResponseNotFound, VacationResponsePatchObject, VacationResponseSetError, VacationResponseSetRequest, VacationResponseSetResponse, VacationResponseUpdateResponse} 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 ca4ea06..c433d17 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 @@ -27,7 +27,7 @@ import org.apache.james.jmap.core.State.INSTANCE import org.apache.james.jmap.core.{AccountId, CapabilityIdentifier, ErrorCode, Invocation, Properties} import org.apache.james.jmap.json.{MailboxSerializer, ResponseSerializer} import org.apache.james.jmap.mail.MailboxGet.UnparsedMailboxId -import org.apache.james.jmap.mail._ +import org.apache.james.jmap.mail.{Mailbox, MailboxFactory, MailboxGet, MailboxGetRequest, MailboxGetResponse, NotFound, PersonalNamespace, Subscriptions} import org.apache.james.jmap.routes.SessionSupplier import org.apache.james.jmap.utils.quotas.{QuotaLoader, QuotaLoaderWithPreloadedDefaultFactory} import org.apache.james.mailbox.exception.MailboxNotFoundException 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 e247a10..123e7aa 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 @@ -22,7 +22,7 @@ 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._ +import org.apache.james.jmap.core.{CanCalculateChanges, ErrorCode, Invocation, Limit, Position, QueryState} import org.apache.james.jmap.json.{MailboxQuerySerializer, ResponseSerializer} import org.apache.james.jmap.mail.{MailboxQueryRequest, MailboxQueryResponse} import org.apache.james.jmap.routes.SessionSupplier 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 4fab40c..42efd8f 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 @@ -34,7 +34,7 @@ import org.apache.james.jmap.JMAPUrls.JMAP import org.apache.james.jmap.core.CapabilityIdentifier.CapabilityIdentifier import org.apache.james.jmap.core.Invocation.MethodName import org.apache.james.jmap.core.ProblemDetails.{notJSONProblem, notRequestProblem, unknownCapabilityProblem} -import org.apache.james.jmap.core._ +import org.apache.james.jmap.core.{DefaultCapabilities, ErrorCode, Invocation, MissingCapabilityException, ProblemDetails, RequestObject, ResponseObject} import org.apache.james.jmap.exceptions.UnauthorizedException import org.apache.james.jmap.http.rfc8621.InjectionKeys import org.apache.james.jmap.http.{Authenticator, MailboxesProvisioner, UserProvisioning} 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 38388b0..760d95c 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 @@ -22,7 +22,7 @@ package org.apache.james.jmap.routes import javax.inject.Inject import org.apache.james.core.Username import org.apache.james.jmap.core.CapabilityIdentifier.CapabilityIdentifier -import org.apache.james.jmap.core._ +import org.apache.james.jmap.core.{Account, AccountId, DefaultCapabilities, IsPersonal, IsReadOnly, JmapRfc8621Configuration, Session} import reactor.core.scala.publisher.SMono class SessionSupplier @Inject() (val configuration: JmapRfc8621Configuration){ diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/utils/quotas/QuotaReader.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/utils/quotas/QuotaReader.scala index 01ba28d..3c8a7a6 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/utils/quotas/QuotaReader.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/utils/quotas/QuotaReader.scala @@ -23,7 +23,7 @@ import javax.inject.Inject import org.apache.james.core.quota.{QuotaLimitValue, QuotaUsageValue} import org.apache.james.jmap.core.UnsignedInt import org.apache.james.jmap.core.UnsignedInt.UnsignedInt -import org.apache.james.jmap.mail._ +import org.apache.james.jmap.mail.{Quota, QuotaId, QuotaRoot, Quotas, Value} import org.apache.james.mailbox.exception.MailboxException import org.apache.james.mailbox.model.{Quota => ModelQuota} import org.apache.james.mailbox.quota.QuotaManager diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/MailboxValidationTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/MailboxValidationTest.scala index 69ff7d0..cd69f53 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/MailboxValidationTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/MailboxValidationTest.scala @@ -23,7 +23,7 @@ import eu.timepit.refined.auto._ import org.apache.james.core.Username import org.apache.james.jmap.core.UnsignedInt.UnsignedInt import org.apache.james.jmap.mail.MailboxName.MailboxName -import org.apache.james.jmap.mail._ +import org.apache.james.jmap.mail.{MailboxValidation, TotalEmails, TotalThreads, UnreadEmails, UnreadThreads} import org.apache.james.mailbox.model.MailboxPath import org.scalatest.matchers.must.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/MailboxGetSerializationTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/MailboxGetSerializationTest.scala index 491dbd2..f39412c 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/MailboxGetSerializationTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/MailboxGetSerializationTest.scala @@ -26,7 +26,7 @@ import org.apache.james.jmap.json.Fixture._ import org.apache.james.jmap.json.MailboxGetSerializationTest._ import org.apache.james.jmap.json.MailboxSerializationTest.MAILBOX import org.apache.james.jmap.mail.MailboxGet.UnparsedMailboxId -import org.apache.james.jmap.mail._ +import org.apache.james.jmap.mail.{Ids, Mailbox, MailboxGetRequest, MailboxGetResponse, NotFound} import org.apache.james.mailbox.model.{MailboxId, TestId} import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/SessionSerializationTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/SessionSerializationTest.scala index 627ca9d..6d9931e 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/SessionSerializationTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/SessionSerializationTest.scala @@ -27,7 +27,7 @@ import org.apache.james.jmap.core.CapabilityIdentifier.CapabilityIdentifier import org.apache.james.jmap.core.CoreCapabilityProperties.CollationAlgorithm import org.apache.james.jmap.core.MailCapability.EmailQuerySortOption import org.apache.james.jmap.core.State.State -import org.apache.james.jmap.core._ +import org.apache.james.jmap.core.{Account, Capabilities, CoreCapability, CoreCapabilityProperties, IsPersonal, IsReadOnly, MailCapability, MailCapabilityProperties, MaxCallsInRequest, MaxConcurrentRequests, MaxConcurrentUpload, MaxMailboxDepth, MaxMailboxesPerEmail, MaxObjectsInGet, MaxObjectsInSet, MaxSizeAttachmentsPerEmail, MaxSizeMailboxName, MaxSizeRequest, MaxSizeUpload, MayCreateTopLevelMailbox, QuotaCapability, Session, SharesCapability, VacationResponseCapability} import org.apache.james.jmap.json.SessionSerializationTest.SESSION import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec 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 52ce1cd..526da86 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 @@ -35,13 +35,13 @@ import org.apache.james.core.{Domain, Username} 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.core.CapabilityIdentifier.{CapabilityIdentifier, JMAP_CORE} import org.apache.james.jmap.core.Invocation.MethodName import org.apache.james.jmap.core.{JmapRfc8621Configuration, RequestLevelErrorType} import org.apache.james.jmap.http.{Authenticator, BasicAuthenticationStrategy, MailboxesProvisioner, UserProvisioning} import org.apache.james.jmap.method.{CoreEchoMethod, Method} import org.apache.james.jmap.routes.JMAPApiRoutesTest._ +import org.apache.james.jmap.{JMAPConfiguration, JMAPRoutesHandler, JMAPServer, Version, VersionParser} import org.apache.james.mailbox.extension.PreDeletionHook import org.apache.james.mailbox.inmemory.{InMemoryMailboxManager, MemoryMailboxManagerProvider} import org.apache.james.mailbox.store.StoreSubscriptionManager 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 d0cad56..6cab55a 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 @@ -30,11 +30,11 @@ import io.restassured.http.ContentType 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.core.JmapRfc8621Configuration import org.apache.james.jmap.core.JmapRfc8621Configuration.LOCALHOST_URL_PREFIX import org.apache.james.jmap.http.Authenticator import org.apache.james.jmap.routes.SessionRoutesTest.{BOB, TEST_CONFIGURATION} +import org.apache.james.jmap.{JMAPConfiguration, JMAPRoutesHandler, JMAPServer, Version, VersionParser} import org.apache.james.mailbox.MailboxSession import org.mockito.ArgumentMatchers.any import org.mockito.Mockito._ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
