chibenwa commented on a change in pull request #391:
URL: https://github.com/apache/james-project/pull/391#discussion_r629056902
##########
File path:
server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/change/StateChange.scala
##########
@@ -22,51 +22,110 @@ package org.apache.james.jmap.change
import org.apache.james.core.Username
import org.apache.james.events.Event
import org.apache.james.events.Event.EventId
-import org.apache.james.jmap.api.change.{State => JavaState}
-import org.apache.james.jmap.core.{AccountId, PushState, State, StateChange}
-
-object TypeName {
- val ALL: Set[TypeName] = Set(EmailTypeName, MailboxTypeName, ThreadTypeName,
IdentityTypeName, EmailSubmissionTypeName, EmailDeliveryTypeName)
-
- def parse(string: String): Either[String, TypeName] = string match {
- case MailboxTypeName.asString => Right(MailboxTypeName)
- case EmailTypeName.asString => Right(EmailTypeName)
- case ThreadTypeName.asString => Right(ThreadTypeName)
- case IdentityTypeName.asString => Right(IdentityTypeName)
- case EmailSubmissionTypeName.asString => Right(EmailSubmissionTypeName)
- case EmailDeliveryTypeName.asString => Right(EmailDeliveryTypeName)
- case VacationResponseTypeName.asString => Right(VacationResponseTypeName)
- case _ => Left(s"Unknown typeName $string")
- }
-}
+import org.apache.james.jmap.core.{AccountId, PushState, State, StateChange,
UuidState}
-sealed trait TypeName {
+import java.util.UUID
+import scala.util.Try
+
+trait TypeName {
def asMap(maybeState: Option[State]): Map[TypeName, State] =
maybeState.map(state => Map[TypeName, State](this -> state))
.getOrElse(Map())
def asString(): String
+ def parse(string: String): Option[TypeName]
+ def parseState(string: String): Either[IllegalArgumentException, State]
}
case object MailboxTypeName extends TypeName {
override val asString: String = "Mailbox"
+
+ override def parse(string: String): Option[TypeName] = string match {
+ case MailboxTypeName.asString => Some(MailboxTypeName)
+ case _ => None
+ }
+
+ override def parseState(string: String): Either[IllegalArgumentException,
UuidState] = Try(UUID.fromString(string))
+ .toEither
+ .map(UuidState(_))
+ .left.map(new IllegalArgumentException(_))
}
case object EmailTypeName extends TypeName {
override val asString: String = "Email"
+
+ override def parse(string: String): Option[TypeName] = string match {
+ case EmailTypeName.asString => Some(EmailTypeName)
+ case _ => None
+ }
+
+ override def parseState(string: String): Either[IllegalArgumentException,
UuidState] = Try(UUID.fromString(string))
+ .toEither
+ .map(UuidState(_))
+ .left.map(new IllegalArgumentException(_))
Review comment:
```
Try(UUID.fromString(string))
.toEither
.map(UuidState(_))
.left.map(new IllegalArgumentException(_))
```
should be factorized in a `UuidState.parse` method...
--
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]
