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 83320c4c61e48af5f3bb39bfbb298ce153e76b2c Author: Benoit Tellier <[email protected]> AuthorDate: Mon Nov 2 10:11:53 2020 +0700 [REFACTORING] Relocate Vacation models in vacation package --- .../apache/james/jmap/{mail => vacation}/VacationResponse.scala | 7 ++++--- .../james/jmap/{mail => vacation}/VacationResponseGet.scala | 8 ++++---- .../org/apache/james/jmap/vacation/VacationResponseSet.scala | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/VacationResponse.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/vacation/VacationResponse.scala similarity index 94% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/VacationResponse.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/vacation/VacationResponse.scala index d25c603..c1c44d5 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/VacationResponse.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/vacation/VacationResponse.scala @@ -17,14 +17,15 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.mail +package org.apache.james.jmap.vacation import eu.timepit.refined.api.Refined import eu.timepit.refined.auto._ import eu.timepit.refined.collection.NonEmpty import org.apache.james.jmap.api.vacation.Vacation -import org.apache.james.jmap.model.Id.Id -import org.apache.james.jmap.model.{Properties, UTCDate} +import org.apache.james.jmap.core.Id.Id +import org.apache.james.jmap.core.{Properties, UTCDate} +import org.apache.james.jmap.mail.Subject import scala.compat.java8.OptionConverters._ diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/VacationResponseGet.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/vacation/VacationResponseGet.scala similarity index 89% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/VacationResponseGet.scala rename to server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/vacation/VacationResponseGet.scala index 5509e18..6b9f6e7 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/VacationResponseGet.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/vacation/VacationResponseGet.scala @@ -17,12 +17,12 @@ * under the License. * ****************************************************************/ -package org.apache.james.jmap.mail +package org.apache.james.jmap.vacation -import org.apache.james.jmap.mail.VacationResponse.UnparsedVacationResponseId +import org.apache.james.jmap.core.State.State +import org.apache.james.jmap.core.{AccountId, Properties} import org.apache.james.jmap.method.WithAccountId -import org.apache.james.jmap.model.State.State -import org.apache.james.jmap.model.{AccountId, Properties} +import org.apache.james.jmap.vacation.VacationResponse.UnparsedVacationResponseId case class VacationResponseIds(value: List[UnparsedVacationResponseId]) 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 6a68a53..6cfe717 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 @@ -24,10 +24,10 @@ import java.time.format.DateTimeFormatter import org.apache.james.jmap.api.vacation.Vacation.ID import org.apache.james.jmap.api.vacation.VacationPatch +import org.apache.james.jmap.core.AccountId +import org.apache.james.jmap.core.SetError.{SetErrorDescription, SetErrorType, invalidArgumentValue, serverFailValue} +import org.apache.james.jmap.core.State.State import org.apache.james.jmap.method.WithAccountId -import org.apache.james.jmap.model.AccountId -import org.apache.james.jmap.model.SetError.{SetErrorDescription, SetErrorType, invalidArgumentValue, serverFailValue} -import org.apache.james.jmap.model.State.State import org.apache.james.util.ValuePatch import play.api.libs.json.{JsBoolean, JsNull, JsObject, JsString, JsValue} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
