chibenwa commented on a change in pull request #391:
URL: https://github.com/apache/james-project/pull/391#discussion_r628316121
##########
File path:
server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/JmapEventSerializer.scala
##########
@@ -19,55 +19,45 @@
package org.apache.james.jmap.change
-import java.util.Optional
-
import com.fasterxml.jackson.annotation.JsonProperty
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.core.UuidState
import org.apache.james.json.JsonGenericSerializer
-import scala.jdk.OptionConverters._
+import javax.inject.Inject
+import scala.jdk.CollectionConverters._
-object StateChangeEventDTO {
+case class StateChangeEventDTOFactory @Inject()(typeStateFactory:
TypeStateFactory) {
val dtoModule: EventDTOModule[StateChangeEvent, StateChangeEventDTO] =
EventDTOModule.forEvent(classOf[StateChangeEvent])
.convertToDTO(classOf[StateChangeEventDTO])
- .toDomainObjectConverter(dto => dto.toDomainObject)
- .toDTOConverter((event, aType) => StateChangeEventDTO.toDTO(event))
+ .toDomainObjectConverter(dto => dto.toDomainObject(typeStateFactory))
+ .toDTOConverter((event, aType) => toDTO(event))
.typeName(classOf[StateChangeEvent].getCanonicalName)
.withFactory(EventDTOModule.apply);
def toDTO(event: StateChangeEvent): StateChangeEventDTO =
StateChangeEventDTO(
getType = classOf[StateChangeEvent].getCanonicalName,
getEventId = event.eventId.getId.toString,
- getUsername = event.username.asString(),
- getMailboxState = event.getState(MailboxTypeName).map(_.serialize).toJava,
- getEmailState = event.getState(EmailTypeName).map(_.serialize).toJava,
- getVacationResponseState =
event.getState(VacationResponseTypeName).map(_.serialize).toJava,
- getEmailDeliveryState =
event.getState(EmailDeliveryTypeName).map(_.serialize).toJava)
+ getUsername = event.username.asString,
+ getTypeStateMap = event.map.map(element => element._1.asString() ->
element._2.serialize).asJava)
}
case class StateChangeEventDTO(@JsonProperty("type") getType: String,
@JsonProperty("eventId") getEventId: String,
@JsonProperty("username") getUsername: String,
- @JsonProperty("vacationResponseState")
getVacationResponseState: Optional[String],
- @JsonProperty("mailboxState") getMailboxState:
Optional[String],
- @JsonProperty("emailState") getEmailState:
Optional[String],
- @JsonProperty("emailDeliveryState")
getEmailDeliveryState: Optional[String]) extends EventDTO {
- def toDomainObject: StateChangeEvent = StateChangeEvent(
+ @JsonProperty("typeStateMap") getTypeStateMap:
java.util.Map[String, String]) extends EventDTO {
+ def toDomainObject(typeStateFactory: TypeStateFactory): StateChangeEvent =
StateChangeEvent(
eventId = EventId.of(getEventId),
username = Username.of(getUsername),
- map = List(VacationResponseTypeName -> getVacationResponseState,
- MailboxTypeName -> getMailboxState,
- EmailTypeName -> getEmailState,
- EmailDeliveryTypeName -> getEmailDeliveryState)
- .flatMap(element => element._2.toScala.map(stateString => element._1 ->
UuidState.fromStringUnchecked(stateString))).toMap)
+ map = getTypeStateMap.asScala.filter(element =>
typeStateFactory.parse(element._1).isRight)
+ .map(element => typeStateFactory.parse(element._1).toOption.get ->
UuidState.fromStringUnchecked(element._2)).toMap)
Review comment:
Why do you parse `element._1` two time?
I would be you I would definitly flatMap on the option...
```
getTypeStateMap.asScala.flatMap(element =>
typeStateFactory.parse(element._1).toOption
.map(typeState => typeState ->
UuidState.fromStringUnchecked(element._2)).toMap
```
Also:
- 'get' calls are always suspicious. Here it was needed because you did not
leverage type state
- The distributed test will not be passing. Because you enforce the use of
an UuidState. If I remember well it is the responsibility of the TypeState
factory to parse state. That way the state could have virtually any format, any
subtype <3
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
