MAILBOX-359 Switch Scala Event trait back to private This needs to be done by wrapping all references to this trait as private
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0cdd567c Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0cdd567c Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0cdd567c Branch: refs/heads/master Commit: 0cdd567c3a5ef35dbf1b6a21547ec5e8a6c85cad Parents: 0a16e7c Author: Benoit Tellier <btell...@linagora.com> Authored: Tue Dec 25 15:47:22 2018 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Tue Jan 8 14:39:29 2019 +0700 ---------------------------------------------------------------------- .../apache/james/event/json/EventSerializer.scala | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/0cdd567c/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala ---------------------------------------------------------------------- diff --git a/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala b/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala index 6418425..3628e37 100644 --- a/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala +++ b/mailbox/event/json/src/main/scala/org/apache/james/event/json/EventSerializer.scala @@ -35,7 +35,7 @@ import play.api.libs.json.{JsError, JsNull, JsNumber, JsObject, JsResult, JsStri import scala.collection.JavaConverters._ -sealed trait Event { +private sealed trait Event { def toJava: JavaEvent } @@ -304,20 +304,24 @@ class JsonSerialize(mailboxIdFactory: MailboxId.Factory, messageIdFactory: Messa implicit val messageMetaDataReads: Reads[DTOs.MessageMetaData] = Json.reads[DTOs.MessageMetaData] implicit val updatedFlagsReads: Reads[DTOs.UpdatedFlags] = Json.reads[DTOs.UpdatedFlags] - implicit val eventOFormat: OFormat[Event] = derived.oformat() + private class EventSerializerPrivateWrapper { + implicit val eventOFormat: OFormat[Event] = derived.oformat() - def toJson(event: Event): String = Json.toJson(event).toString() + def toJson(event: Event): String = Json.toJson(event).toString() + def fromJson(json: String): JsResult[Event] = Json.fromJson[Event](Json.parse(json)) + } - def fromJson(json: String): JsResult[Event] = Json.fromJson[Event](Json.parse(json)) + def toJson(event: JavaEvent): String = new EventSerializerPrivateWrapper().toJson(ScalaConverter.toScala(event)) + def fromJson(json: String): JsResult[JavaEvent] = new EventSerializerPrivateWrapper().fromJson(json) + .map(event => event.toJava) } class EventSerializer(mailboxIdFactory: MailboxId.Factory, messageIdFactory: MessageId.Factory) { - def toJson(event: JavaEvent): String = new JsonSerialize(mailboxIdFactory, messageIdFactory).toJson(ScalaConverter.toScala(event)) + def toJson(event: JavaEvent): String = new JsonSerialize(mailboxIdFactory, messageIdFactory).toJson(event) def fromJson(json: String): JsResult[JavaEvent] = { new JsonSerialize(mailboxIdFactory, messageIdFactory) .fromJson(json) - .map(event => event.toJava) } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
