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 dcfdca4f3480404a5c5fcd45d991920730fc1c3e Author: Benoit Tellier <[email protected]> AuthorDate: Mon Nov 2 10:13:51 2020 +0700 [REFACTORING] Rename model package to core --- .../org/apache/james/jmap/rfc8621/RFC8621MethodsModule.java | 4 ++-- .../james/jmap/rfc8621/contract/EmailQueryMethodContract.scala | 2 +- .../james/jmap/rfc8621/contract/EmailSetMethodContract.scala | 2 +- .../org/apache/james/jmap/{model => core}/Capabilities.scala | 4 ++-- .../org/apache/james/jmap/{model => core}/Capability.scala | 10 +++++----- .../main/scala/org/apache/james/jmap/{model => core}/Id.scala | 2 +- .../org/apache/james/jmap/{model => core}/Invocation.scala | 4 ++-- .../james/jmap/{model => core}/JmapRfc8621Configuration.scala | 4 ++-- .../org/apache/james/jmap/{model => core}/ProblemDetails.scala | 6 +++--- .../org/apache/james/jmap/{model => core}/Properties.scala | 2 +- .../scala/org/apache/james/jmap/{model => core}/Query.scala | 2 +- .../james/jmap/{model => core}/RequestLevelErrorType.scala | 4 ++-- .../org/apache/james/jmap/{model => core}/RequestObject.scala | 6 +++--- .../org/apache/james/jmap/{model => core}/ResponseObject.scala | 4 ++-- .../scala/org/apache/james/jmap/{model => core}/Session.scala | 8 ++++---- .../scala/org/apache/james/jmap/{model => core}/SetError.scala | 4 ++-- .../org/apache/james/jmap/{model => core}/StatusCode.scala | 2 +- .../scala/org/apache/james/jmap/{model => core}/UTCDate.scala | 4 ++-- .../org/apache/james/jmap/{model => core}/UnsignedInt.scala | 2 +- .../jmap/{model => core}/JmapRfc8621ConfigurationTest.scala | 6 +++--- .../org/apache/james/jmap/{model => core}/KeywordTest.scala | 4 +++- .../james/jmap/{model => core}/KeywordsCombinerTest.scala | 6 ++++-- .../org/apache/james/jmap/{model => core}/KeywordsTest.scala | 9 +++++---- .../james/jmap/{model => core}/MailboxValidationTest.scala | 4 ++-- .../org/apache/james/jmap/{model => core}/UTCDateTest.scala | 2 +- 25 files changed, 56 insertions(+), 51 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 f2c599b..08b9328 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 @@ -20,7 +20,7 @@ package org.apache.james.jmap.rfc8621; -import static org.apache.james.jmap.model.JmapRfc8621Configuration.LOCALHOST_CONFIGURATION; +import static org.apache.james.jmap.core.JmapRfc8621Configuration.LOCALHOST_CONFIGURATION; import java.io.FileNotFoundException; @@ -28,6 +28,7 @@ import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.james.jmap.JMAPRoutesHandler; import org.apache.james.jmap.Version; +import org.apache.james.jmap.core.JmapRfc8621Configuration; import org.apache.james.jmap.http.Authenticator; import org.apache.james.jmap.http.BasicAuthenticationStrategy; import org.apache.james.jmap.http.rfc8621.InjectionKeys; @@ -44,7 +45,6 @@ import org.apache.james.jmap.method.SystemZoneIdProvider; import org.apache.james.jmap.method.VacationResponseGetMethod; import org.apache.james.jmap.method.VacationResponseSetMethod; 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; 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/EmailQueryMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala index de4683f..9007184 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailQueryMethodContract.scala @@ -37,8 +37,8 @@ import net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER import net.javacrumbs.jsonunit.core.internal.Options import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer +import org.apache.james.jmap.core.UTCDate import org.apache.james.jmap.http.UserCredential -import org.apache.james.jmap.model.UTCDate 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.FlagsBuilder import org.apache.james.mailbox.MessageManager.AppendCommand diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala index 025bd7a..4fa93d0 100644 --- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala +++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSetMethodContract.scala @@ -31,9 +31,9 @@ import javax.mail.Flags import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson import org.apache.http.HttpStatus.SC_OK import org.apache.james.GuiceJamesServer +import org.apache.james.jmap.core.UTCDate import org.apache.james.jmap.draft.{JmapGuiceProbe, MessageIdProbe} import org.apache.james.jmap.http.UserCredential -import org.apache.james.jmap.model.UTCDate import org.apache.james.jmap.rfc8621.contract.Fixture.{ACCEPT_RFC8621_VERSION_HEADER, ACCOUNT_ID, ANDRE, ANDRE_PASSWORD, BOB, BOB_PASSWORD, DOMAIN, authScheme, baseRequestSpecBuilder} import org.apache.james.mailbox.FlagsBuilder import org.apache.james.mailbox.MessageManager.AppendCommand diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Capabilities.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capabilities.scala similarity index 93% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Capabilities.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capabilities.scala index fc96632..8b74337 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Capabilities.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capabilities.scala @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import eu.timepit.refined.auto._ -import org.apache.james.jmap.model.CapabilityIdentifier.{CapabilityIdentifier, JAMES_QUOTA, JAMES_SHARES, JMAP_CORE, JMAP_MAIL, JMAP_VACATION_RESPONSE} +import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_QUOTA, JAMES_SHARES, JMAP_CORE, JMAP_MAIL, JMAP_VACATION_RESPONSE} object DefaultCapabilities { def coreCapability(maxUploadSize: MaxSizeUpload) = CoreCapability( diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Capability.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capability.scala similarity index 93% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Capability.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capability.scala index 4f1202d..1cebf30 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Capability.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capability.scala @@ -17,17 +17,17 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import eu.timepit.refined import eu.timepit.refined.api.Refined import eu.timepit.refined.auto._ import eu.timepit.refined.collection.NonEmpty import eu.timepit.refined.string.Uri -import org.apache.james.jmap.model.CapabilityIdentifier.{CapabilityIdentifier, JAMES_QUOTA, JAMES_SHARES, JMAP_CORE, JMAP_MAIL, JMAP_VACATION_RESPONSE} -import org.apache.james.jmap.model.CoreCapabilityProperties.CollationAlgorithm -import org.apache.james.jmap.model.MailCapability.EmailQuerySortOption -import org.apache.james.jmap.model.UnsignedInt.{UnsignedInt, UnsignedIntConstraint} +import org.apache.james.jmap.core.CapabilityIdentifier.{CapabilityIdentifier, JAMES_QUOTA, JAMES_SHARES, JMAP_CORE, JMAP_MAIL, JMAP_VACATION_RESPONSE} +import org.apache.james.jmap.core.CoreCapabilityProperties.CollationAlgorithm +import org.apache.james.jmap.core.MailCapability.EmailQuerySortOption +import org.apache.james.jmap.core.UnsignedInt.{UnsignedInt, UnsignedIntConstraint} import org.apache.james.util.Size import scala.util.{Failure, Success, Try} diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Id.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Id.scala similarity index 97% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Id.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Id.scala index 0dc7167..60fc3d7 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Id.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Id.scala @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import eu.timepit.refined import eu.timepit.refined.api.Refined diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Invocation.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Invocation.scala similarity index 96% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Invocation.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Invocation.scala index 8faf272..9d2f631 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Invocation.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Invocation.scala @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import eu.timepit.refined.auto._ import eu.timepit.refined.types.string.NonEmptyString -import org.apache.james.jmap.model.Invocation.{Arguments, MethodCallId, MethodName} +import org.apache.james.jmap.core.Invocation.{Arguments, MethodCallId, MethodName} import play.api.libs.json._ case class Invocation(methodName: MethodName, arguments: Arguments, methodCallId: MethodCallId) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/JmapRfc8621Configuration.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/JmapRfc8621Configuration.scala similarity index 95% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/JmapRfc8621Configuration.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/JmapRfc8621Configuration.scala index 5897623..9ce796a 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/JmapRfc8621Configuration.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/JmapRfc8621Configuration.scala @@ -17,12 +17,12 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import java.net.URL import org.apache.commons.configuration2.Configuration -import org.apache.james.jmap.model.JmapRfc8621Configuration.UPLOAD_LIMIT_30_MB +import org.apache.james.jmap.core.JmapRfc8621Configuration.UPLOAD_LIMIT_30_MB import org.apache.james.util.Size object JmapRfc8621Configuration { diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/ProblemDetails.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/ProblemDetails.scala similarity index 92% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/ProblemDetails.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/ProblemDetails.scala index 4e8df2d..4d864d9 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/ProblemDetails.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/ProblemDetails.scala @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import eu.timepit.refined.auto._ import org.apache.http.HttpStatus.SC_BAD_REQUEST -import org.apache.james.jmap.model.RequestLevelErrorType.ErrorTypeIdentifier -import org.apache.james.jmap.model.StatusCode.ErrorStatus +import org.apache.james.jmap.core.RequestLevelErrorType.ErrorTypeIdentifier +import org.apache.james.jmap.core.StatusCode.ErrorStatus /** * Problem Details for HTTP APIs within the JMAP context diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Properties.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Properties.scala similarity index 98% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Properties.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Properties.scala index 12d749b..bfbe18d 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Properties.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Properties.scala @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import eu.timepit.refined.collection.NonEmpty import eu.timepit.refined.refineV diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Query.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Query.scala similarity index 98% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Query.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Query.scala index a2f6e07..3e746d8 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Query.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Query.scala @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import com.google.common.hash.Hashing import eu.timepit.refined.api.Refined diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/RequestLevelErrorType.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/RequestLevelErrorType.scala similarity index 97% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/RequestLevelErrorType.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/RequestLevelErrorType.scala index 5013a73..9fc0e43 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/RequestLevelErrorType.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/RequestLevelErrorType.scala @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import eu.timepit.refined.api.Refined -import eu.timepit.refined.string.Uri import eu.timepit.refined.auto._ +import eu.timepit.refined.string.Uri object RequestLevelErrorType { type ErrorTypeIdentifier = String Refined Uri diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/RequestObject.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/RequestObject.scala similarity index 92% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/RequestObject.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/RequestObject.scala index 3f40af6..c612a7e 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/RequestObject.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/RequestObject.scala @@ -17,10 +17,10 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core -import org.apache.james.jmap.model.CapabilityIdentifier.CapabilityIdentifier -import org.apache.james.jmap.model.Id.Id +import org.apache.james.jmap.core.CapabilityIdentifier.CapabilityIdentifier +import org.apache.james.jmap.core.Id.Id final case class ClientId(value: Id) { def referencesPreviousCreationId: Boolean = value.value.startsWith("#") diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/ResponseObject.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/ResponseObject.scala similarity index 94% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/ResponseObject.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/ResponseObject.scala index f36f512..349e692 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/ResponseObject.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/ResponseObject.scala @@ -17,10 +17,10 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import eu.timepit.refined.auto._ -import org.apache.james.jmap.model.State.State +import org.apache.james.jmap.core.State.State case class ResponseObject(sessionState: State, methodResponses: Seq[Invocation]) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Session.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Session.scala similarity index 94% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Session.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Session.scala index c76c5b3..00d6708 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/Session.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Session.scala @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import java.net.URL import java.nio.charset.StandardCharsets @@ -28,9 +28,9 @@ import eu.timepit.refined.auto._ import eu.timepit.refined.collection.NonEmpty import eu.timepit.refined.refineV import org.apache.james.core.Username -import org.apache.james.jmap.model.CapabilityIdentifier.CapabilityIdentifier -import org.apache.james.jmap.model.Id.Id -import org.apache.james.jmap.model.State.{INSTANCE, State} +import org.apache.james.jmap.core.CapabilityIdentifier.CapabilityIdentifier +import org.apache.james.jmap.core.Id.Id +import org.apache.james.jmap.core.State.{INSTANCE, State} case class IsPersonal(value: Boolean) case class IsReadOnly(value: Boolean) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/SetError.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/SetError.scala similarity index 95% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/SetError.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/SetError.scala index dc23bcc..5e13ca5 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/SetError.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/SetError.scala @@ -17,12 +17,12 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import eu.timepit.refined.api.Refined import eu.timepit.refined.auto._ import eu.timepit.refined.collection.NonEmpty -import org.apache.james.jmap.model.SetError.{SetErrorDescription, SetErrorType} +import org.apache.james.jmap.core.SetError.{SetErrorDescription, SetErrorType} object SetError { type SetErrorType = String Refined NonEmpty diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/StatusCode.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/StatusCode.scala similarity index 97% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/StatusCode.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/StatusCode.scala index 4de45e7..64661d5 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/StatusCode.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/StatusCode.scala @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import eu.timepit.refined.api.Refined import eu.timepit.refined.numeric.Interval.Closed diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/UTCDate.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/UTCDate.scala similarity index 94% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/UTCDate.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/UTCDate.scala index 3acfb1c..7c62977 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/UTCDate.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/UTCDate.scala @@ -17,12 +17,12 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import java.time.{ZoneId, ZonedDateTime} import java.util.Date -import org.apache.james.jmap.model.UTCDate.UTC_ZONE_ID +import org.apache.james.jmap.core.UTCDate.UTC_ZONE_ID object UTCDate { private val UTC_ZONE_ID: ZoneId = ZoneId.of("UTC") diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/UnsignedInt.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/UnsignedInt.scala similarity index 98% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/UnsignedInt.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/UnsignedInt.scala index 606b631..cabfb11 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/model/UnsignedInt.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/UnsignedInt.scala @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import eu.timepit.refined import eu.timepit.refined.api.Refined diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/JmapRfc8621ConfigurationTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/JmapRfc8621ConfigurationTest.scala similarity index 93% rename from server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/JmapRfc8621ConfigurationTest.scala rename to server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/JmapRfc8621ConfigurationTest.scala index 5d82b91..387f610 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/JmapRfc8621ConfigurationTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/JmapRfc8621ConfigurationTest.scala @@ -17,13 +17,13 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import java.net.URL import org.apache.commons.configuration2.{Configuration, PropertiesConfiguration} -import org.apache.james.jmap.model.JmapRfc8621Configuration.URL_PREFIX_PROPERTIES -import org.apache.james.jmap.model.JmapRfc8621ConfigurationTest.{emptyConfiguration, providedConfiguration} +import org.apache.james.jmap.core.JmapRfc8621Configuration.URL_PREFIX_PROPERTIES +import org.apache.james.jmap.core.JmapRfc8621ConfigurationTest.{emptyConfiguration, providedConfiguration} 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/model/KeywordTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/KeywordTest.scala similarity index 98% rename from server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/KeywordTest.scala rename to server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/KeywordTest.scala index 96d5d93..d548bad 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/KeywordTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/KeywordTest.scala @@ -17,14 +17,16 @@ * under the License. * * **************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import javax.mail.Flags import nl.jqno.equalsverifier.EqualsVerifier import org.apache.commons.lang3.StringUtils +import org.apache.james.jmap.mail.Keyword import org.assertj.core.api.Assertions.{assertThat, assertThatCode} import org.scalatest.matchers.must.Matchers import org.scalatest.wordspec.AnyWordSpec + import scala.util.Failure object KeywordTest { diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/KeywordsCombinerTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/KeywordsCombinerTest.scala similarity index 96% rename from server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/KeywordsCombinerTest.scala rename to server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/KeywordsCombinerTest.scala index 59d3df9..94f0b8b 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/KeywordsCombinerTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/KeywordsCombinerTest.scala @@ -17,13 +17,15 @@ * under the License. * * **************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core -import org.apache.james.jmap.model.KeywordsFactory.LENIENT_KEYWORDS_FACTORY +import org.apache.james.jmap.mail.KeywordsFactory.LENIENT_KEYWORDS_FACTORY +import org.apache.james.jmap.mail.{Keywords, KeywordsCombiner} import org.apache.james.util.CommutativityChecker import org.assertj.core.api.Assertions.assertThat import org.scalatest.matchers.must.Matchers import org.scalatest.wordspec.AnyWordSpec + import scala.jdk.CollectionConverters._ class KeywordsCombinerTest extends AnyWordSpec with Matchers { diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/KeywordsTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/KeywordsTest.scala similarity index 97% rename from server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/KeywordsTest.scala rename to server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/KeywordsTest.scala index 5d28d36..0708919 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/KeywordsTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/KeywordsTest.scala @@ -17,14 +17,15 @@ * under the License. * * **************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core -import org.assertj.core.api.Assertions.assertThat import javax.mail.Flags import javax.mail.Flags.Flag -import org.apache.james.mailbox.FlagsBuilder import nl.jqno.equalsverifier.EqualsVerifier -import org.apache.james.jmap.model.KeywordsFactory.{LENIENT_KEYWORDS_FACTORY, STRICT_KEYWORDS_FACTORY} +import org.apache.james.jmap.mail.Keywords +import org.apache.james.jmap.mail.KeywordsFactory.{LENIENT_KEYWORDS_FACTORY, STRICT_KEYWORDS_FACTORY} +import org.apache.james.mailbox.FlagsBuilder +import org.assertj.core.api.Assertions.assertThat 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/model/MailboxValidationTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/MailboxValidationTest.scala similarity index 97% rename from server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/MailboxValidationTest.scala rename to server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/MailboxValidationTest.scala index dc54d01..69ff7d0 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/MailboxValidationTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/MailboxValidationTest.scala @@ -17,13 +17,13 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core 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.model.UnsignedInt.UnsignedInt 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/model/UTCDateTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/UTCDateTest.scala similarity index 98% rename from server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/UTCDateTest.scala rename to server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/UTCDateTest.scala index f1ffe03..6060a6b 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/model/UTCDateTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/core/UTCDateTest.scala @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.model +package org.apache.james.jmap.core import java.time.ZonedDateTime --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
