You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2020/09/25 01:51:50 UTC
[james-project] 05/13: JAMES-3379 Remove unused Option
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 0e0b6437522bea94ec39803460a8cee9780ecf91
Author: LanKhuat <dl...@linagora.com>
AuthorDate: Thu Sep 24 12:02:50 2020 +0700
JAMES-3379 Remove unused Option
---
.../scala/org/apache/james/jmap/mail/Email.scala | 18 +++++++-------
.../org/apache/james/jmap/mail/EmailGet.scala | 2 +-
.../org/apache/james/jmap/mail/EmailHeader.scala | 28 +++++++++++-----------
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Email.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Email.scala
index 0653d80..8efb10f 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Email.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/Email.scala
@@ -182,30 +182,30 @@ object ParseOptions {
}
sealed trait ParseOption {
- def extractHeaderValue(field: Field): Option[EmailHeaderValue]
+ def extractHeaderValue(field: Field): EmailHeaderValue
}
case object AsRaw extends ParseOption {
- override def extractHeaderValue(field: Field): Option[EmailHeaderValue] = Some(RawHeaderValue.from(field))
+ override def extractHeaderValue(field: Field): EmailHeaderValue = RawHeaderValue.from(field)
}
case object AsText extends ParseOption {
- override def extractHeaderValue(field: Field): Option[EmailHeaderValue] = Some(TextHeaderValue.from(field))
+ override def extractHeaderValue(field: Field): EmailHeaderValue = TextHeaderValue.from(field)
}
case object AsAddresses extends ParseOption {
- override def extractHeaderValue(field: Field): Option[EmailHeaderValue] = Some(AddressesHeaderValue.from(field))
+ override def extractHeaderValue(field: Field): EmailHeaderValue = AddressesHeaderValue.from(field)
}
case object AsGroupedAddresses extends ParseOption {
- override def extractHeaderValue(field: Field): Option[EmailHeaderValue] = Some(GroupedAddressesHeaderValue.from(field))
+ override def extractHeaderValue(field: Field): EmailHeaderValue = GroupedAddressesHeaderValue.from(field)
}
case object AsMessageIds extends ParseOption {
- override def extractHeaderValue(field: Field): Option[EmailHeaderValue] = Some(MessageIdsHeaderValue.from(field))
+ override def extractHeaderValue(field: Field): EmailHeaderValue = MessageIdsHeaderValue.from(field)
}
case object AsDate extends ParseOption {
- override def extractHeaderValue(field: Field): Option[EmailHeaderValue] = Some(DateHeaderValue.from(field, ZoneId.systemDefault()))
+ override def extractHeaderValue(field: Field): EmailHeaderValue = DateHeaderValue.from(field, ZoneId.systemDefault())
- def extractHeaderValue(field: Field, zoneId: ZoneId): Option[EmailHeaderValue] = Some(DateHeaderValue.from(field, zoneId))
+ def extractHeaderValue(field: Field, zoneId: ZoneId): EmailHeaderValue = DateHeaderValue.from(field, zoneId)
}
case object AsURLs extends ParseOption {
- override def extractHeaderValue(field: Field): Option[EmailHeaderValue] = Some(URLsHeaderValue.from(field))
+ override def extractHeaderValue(field: Field): EmailHeaderValue = URLsHeaderValue.from(field)
}
case class HeaderMessageId(value: String) extends AnyVal
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailGet.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailGet.scala
index ea49946..cd4ae81 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailGet.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailGet.scala
@@ -91,7 +91,7 @@ case class SpecificHeaderRequest(headerName: NonEmptyString, property: String, p
.map(_.asScala)
.flatMap(fields => fields.reverse.headOption)
- (headerName, field.flatMap({
+ (headerName, field.map({
val option = parseOption.getOrElse(AsRaw)
option match {
case AsDate => AsDate.extractHeaderValue(_, zoneId)
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailHeader.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailHeader.scala
index 7f05aec..8c8247c 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailHeader.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailHeader.scala
@@ -56,23 +56,23 @@ object GroupedAddressesHeaderValue extends EmailHeaderValue {
.asScala
.toList
- val groups: List[EmailAddressGroup] = addresses
- .flatMap({
- case group: Group => Some(group)
- case _ => None
- })
- .map(group => EmailAddressGroup(Some(GroupName(group.getName)), EmailAddress.from(group.getMailboxes)))
-
- val addressesWithoutGroup: List[EmailAddress] = addresses
- .flatMap({
- case mailbox: Mime4jMailbox => Some(mailbox)
- case _ => None
- })
- .map(EmailAddress.from(_))
-
if (addresses.isEmpty) {
GroupedAddressesHeaderValue(List())
} else {
+ val groups: List[EmailAddressGroup] = addresses
+ .flatMap({
+ case group: Group => Some(group)
+ case _ => None
+ })
+ .map(group => EmailAddressGroup(Some(GroupName(group.getName)), EmailAddress.from(group.getMailboxes)))
+
+ val addressesWithoutGroup: List[EmailAddress] = addresses
+ .flatMap({
+ case mailbox: Mime4jMailbox => Some(mailbox)
+ case _ => None
+ })
+ .map(EmailAddress.from(_))
+
GroupedAddressesHeaderValue(List(EmailAddressGroup(None, addressesWithoutGroup)) ++ groups)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org