This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit edc1623effeb9f2568a518a8ebea91d16dc5427b Author: Quan Tran <[email protected]> AuthorDate: Thu Oct 28 12:09:49 2021 +0700 JAMES-3539 Move TypeStateFactory to data-jmap We need TypeStateFactory at data-jmap level to parse string (stored in Cassandra) to TypeName --- .../scala/org/apache/james/jmap/api}/change/TypeStateFactory.scala | 3 +-- .../main/scala/org/apache/james/jmap/change/JmapEventSerializer.scala | 1 + .../src/main/scala/org/apache/james/jmap/json/PushSerializer.scala | 3 ++- .../main/scala/org/apache/james/jmap/routes/EventSourceRoutes.scala | 3 ++- .../src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala | 2 +- .../org/apache/james/jmap/change/StateChangeEventSerializerTest.scala | 2 ++ .../test/scala/org/apache/james/jmap/change/TypeStateFactoryTest.scala | 2 ++ 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/TypeStateFactory.scala b/server/data/data-jmap/src/main/scala/org/apache/james/jmap/api/change/TypeStateFactory.scala similarity index 97% rename from server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/TypeStateFactory.scala rename to server/data/data-jmap/src/main/scala/org/apache/james/jmap/api/change/TypeStateFactory.scala index fea1ad0..a994f0b 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/TypeStateFactory.scala +++ b/server/data/data-jmap/src/main/scala/org/apache/james/jmap/api/change/TypeStateFactory.scala @@ -17,7 +17,7 @@ * under the License. * * ************************************************************** */ -package org.apache.james.jmap.change +package org.apache.james.jmap.api.change import javax.inject.Inject import org.apache.james.jmap.api.model.TypeName @@ -33,4 +33,3 @@ case class TypeStateFactory @Inject()(setTypeName: java.util.Set[TypeName]) { .map(Right(_)) .getOrElse(Left(new IllegalArgumentException(s"Unknown typeName $string"))) } - diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/JmapEventSerializer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/JmapEventSerializer.scala index 5867d94..bad3974 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/JmapEventSerializer.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/JmapEventSerializer.scala @@ -26,6 +26,7 @@ import javax.inject.Inject import org.apache.james.core.Username import org.apache.james.events.Event.EventId import org.apache.james.events.{Event, EventSerializer} +import org.apache.james.jmap.api.change.TypeStateFactory import org.apache.james.jmap.api.model.{State, TypeName} import org.apache.james.jmap.core.UuidState import org.apache.james.json.JsonGenericSerializer 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 13313a2..eafba65 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 @@ -20,8 +20,9 @@ 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, TypeStateFactory} +import org.apache.james.jmap.change.TypeState import org.apache.james.jmap.core.{AccountId, OutboundMessage, PingMessage, PushState, RequestId, StateChange, WebSocketError, WebSocketInboundMessage, WebSocketPushDisable, WebSocketPushEnable, WebSocketRequest, WebSocketResponse} import play.api.libs.json.{Format, JsError, JsNull, JsObject, JsResult, JsString, JsSuccess, JsValue, Json, OWrites, Reads, Writes} diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/EventSourceRoutes.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/EventSourceRoutes.scala index f9e277f..5debc4e 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/EventSourceRoutes.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/EventSourceRoutes.scala @@ -33,8 +33,9 @@ import javax.inject.{Inject, Named} import org.apache.james.events.{EventBus, Registration} import org.apache.james.jmap.HttpConstants.JSON_CONTENT_TYPE import org.apache.james.jmap.JMAPUrls.EVENT_SOURCE +import org.apache.james.jmap.api.change.TypeStateFactory import org.apache.james.jmap.api.model.TypeName -import org.apache.james.jmap.change.{AccountIdRegistrationKey, StateChangeListener, TypeStateFactory} +import org.apache.james.jmap.change.{AccountIdRegistrationKey, StateChangeListener} import org.apache.james.jmap.core.{OutboundMessage, PingMessage, ProblemDetails, StateChange} import org.apache.james.jmap.exceptions.UnauthorizedException import org.apache.james.jmap.http.rfc8621.InjectionKeys diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala index 233dc03..df627b7 100644 --- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala +++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/routes/WebSocketRoutes.scala @@ -31,7 +31,7 @@ import org.apache.james.core.Username import org.apache.james.events.{EventBus, Registration} import org.apache.james.jmap.HttpConstants.JSON_CONTENT_TYPE import org.apache.james.jmap.JMAPUrls.JMAP_WS -import org.apache.james.jmap.api.change.{EmailChangeRepository, MailboxChangeRepository} +import org.apache.james.jmap.api.change.{EmailChangeRepository, MailboxChangeRepository, TypeStateFactory} import org.apache.james.jmap.api.model.{AccountId => JavaAccountId} import org.apache.james.jmap.change.{AccountIdRegistrationKey, StateChangeListener, _} import org.apache.james.jmap.core.{OutboundMessage, ProblemDetails, RequestId, WebSocketError, WebSocketPushDisable, WebSocketPushEnable, WebSocketRequest, WebSocketResponse, _} diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/StateChangeEventSerializerTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/StateChangeEventSerializerTest.scala index 4ba5f43..08f0010 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/StateChangeEventSerializerTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/StateChangeEventSerializerTest.scala @@ -21,6 +21,8 @@ package org.apache.james.jmap.change import org.apache.james.JsonSerializationVerifier import org.apache.james.core.Username import org.apache.james.events.Event.EventId +import org.apache.james.jmap.api.change +import org.apache.james.jmap.api.change.TypeStateFactory import org.apache.james.jmap.api.model.TypeName import org.apache.james.jmap.change.StateChangeEventSerializerTest.{EVENT, EVENT_EMPTY_TYPE_STATE_MAP, EVENT_ID, EVENT_JSON, EVENT_JSON_EMPTY_TYPE_STATE_MAP, EVENT_JSON_NO_DELIVERY, EVENT_NO_DELIVERY, USERNAME} import org.apache.james.jmap.core.UuidState diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/TypeStateFactoryTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/TypeStateFactoryTest.scala index 2803b3c..61ba9b8 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/TypeStateFactoryTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/change/TypeStateFactoryTest.scala @@ -19,6 +19,8 @@ package org.apache.james.jmap.change +import org.apache.james.jmap.api.change +import org.apache.james.jmap.api.change.TypeStateFactory import org.apache.james.jmap.api.model.TypeName import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.SoftAssertions --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
