Upgraded backend libraries:

backend/app/actors/scheduler/gitlab/GitlabModels.scala

@@ -21,12 +21,10 @@
 
 package actors.scheduler.gitlab
 
-import ai.x.play.json.Encoders.encoder
-import ai.x.play.json.Jsonx
 import org.joda.time.DateTime
 import play.api.libs.json._
+
 import java.util.Date
-import models.BaseFormat._
 
 case class GitlabMilestone(
     due_date: Option[Date],
@@ -85,23 +83,24 @@ case class GitlabIssue(
     assignees: Seq[GitlabUser],
     assignee: Option[GitlabUser],
     labels: Seq[String],
-    upvotes: Int,
-    downvotes: Int,
-    merge_requests_count: Int,
+    // remove to not exceed limit of 22 fields
+    // upvotes: Int,
+    // downvotes: Int,
+    // merge_requests_count: Int,
     id: Int,
     title: String,
     created_at: DateTime,
     updated_at: DateTime,
     closed_at: Option[DateTime],
     closed_by: Option[GitlabUser],
-    subscribed: Option[Boolean],
-    user_notes_count: Int,
+    // subscribed: Option[Boolean],
+    // user_notes_count: Int,
     due_date: Option[Date],
     web_url: String,
     references: Option[GitlabReference],
     time_stats: Option[GitlabTimeslot],
     confidential: Option[Boolean],
-    discussion_locked: Option[Boolean],
+    // discussion_locked: Option[Boolean],
     _links: Option[GitlabLinks],
     task_completion_status: Option[GitlabTaskCompletionStatus]
 )
@@ -117,6 +116,7 @@ case class GitlabIssuesSearchResult(
 )
 
 object GitlabMilestone {
+  import models.BaseFormat._
   implicit val jsonFormat: Format[GitlabMilestone] =
     Json.format[GitlabMilestone]
 }
@@ -138,8 +138,8 @@ object GitlabTaskCompletionStatus {
     Json.format[GitlabTaskCompletionStatus]
 }
 object GitlabIssue {
-  implicit val jsonFormat: Format[GitlabIssue] =
-    Jsonx.formatCaseClass[GitlabIssue]
+  import models.BaseFormat._
+  implicit val jsonFormat: Format[GitlabIssue] = Json.format[GitlabIssue]
 }
 object GitlabIssuesSearchResult {
   implicit val jsonFormat: Format[GitlabIssuesSearchResult] =

backend/app/controllers/ApplicationController.scala

@@ -44,7 +44,7 @@ import scala.concurrent.{ExecutionContext, Future}
 case class LoginForm(email: String, password: String)
 
 object LoginForm {
-  implicit val loginFormFormat = Json.format[LoginForm]
+  implicit val loginFormFormat: OFormat[LoginForm] = Json.format[LoginForm]
 }
 
 class ApplicationController @Inject() (

backend/app/domain/views/UserTimeBookingStatisticsView.scala

@@ -40,7 +40,7 @@ import play.modules.reactivemongo.ReactiveMongoApi
 import repositories._
 
 import scala.annotation.tailrec
-import scala.concurrent.Await
+import scala.concurrent.{Await, ExecutionContextExecutor}
 import scala.concurrent.duration._
 import scala.language.postfixOps
 import scala.util.{Failure, Success}
@@ -81,7 +81,8 @@ class UserTimeBookingStatisticsView(
 
   private val waitTime = 5 seconds
 
-  private implicit val executionContext = context.dispatcher
+  private implicit val executionContext: ExecutionContextExecutor =
+    context.dispatcher
 
   override def restoreViewFromState(snapshot: UserTimeBooking): Unit = {
     println(

backend/app/models/BaseFormat.scala

@@ -22,17 +22,14 @@
 package models
 
 import com.tegonal.play.json.TypedId._
+import julienrf.json.derived
+import julienrf.json.derived.{DerivedReads, TypeTag}
 import models.BaseFormat.CompositeBaseId
-import org.joda.time.format.{DateTimeFormat, ISODateTimeFormat}
-import org.joda.time.{
-  DateTime,
-  DateTimeZone,
-  Duration,
-  LocalDate,
-  LocalDateTime
-}
+import org.joda.time.format.DateTimeFormat
+import org.joda.time._
 import play.api.libs.json._
 import reactivemongo.api.bson._
+import shapeless.Lazy
 
 import java.net.{URI, URL}
 import java.util.UUID
@@ -125,6 +122,20 @@ object BaseFormat {
 
   val defaultTypeFormat: OFormat[String] = (__ \ "type").format[String]
 
+  private val selfTypeFormat: OFormat[String] = __.format[String]
+
+  private def toStringWrites[T]: Writes[T] =
+    Writes[T](obj => JsString(obj.toString))
+
+  def enumFormat[T](implicit
+      derivedReads: Lazy[DerivedReads[T, TypeTag.ShortClassName]]
+  ): Format[T] = {
+    implicit val reads: Reads[T]   = derived.flat.reads(selfTypeFormat)
+    implicit val writes: Writes[T] = toStringWrites[T]
+
+    Format[T](reads, writes)
+  }
+
   val dateTimePattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZZ"
   implicit val dateFormat: Format[DateTime] = Format[DateTime](
     JodaReads.jodaDateReads(dateTimePattern),
@@ -133,9 +144,9 @@ object BaseFormat {
     Format.optionWithNull
 
   val localDateTimePattern = "yyyy-MM-dd'T'HH:mm:ss.SSS"
-  val localDateTimeReads: Reads[LocalDateTime] = {
+  private val localDateTimeReads: Reads[LocalDateTime] = {
     new Reads[LocalDateTime] {
-      val df =
+      private val df =
         DateTimeFormat.forPattern(localDateTimePattern)
 
       def reads(json: JsValue): JsResult[LocalDateTime] = json match {
@@ -160,7 +171,7 @@ object BaseFormat {
           .opt(LocalDateTime.parse(input, df))
     }
   }
-  val localDateTimeWrites: Writes[LocalDateTime] = {
+  private val localDateTimeWrites: Writes[LocalDateTime] = {
     val df =
       org.joda.time.format.DateTimeFormat.forPattern(localDateTimePattern)
     Writes[LocalDateTime] { d =>
@@ -171,9 +182,9 @@ object BaseFormat {
     Format[LocalDateTime](localDateTimeReads, localDateTimeWrites)
 
   val localDatePattern = "yyyy-MM-dd"
-  val localDateReads: Reads[LocalDate] = {
+  private val localDateReads: Reads[LocalDate] = {
     new Reads[LocalDate] {
-      val df =
+      private val df =
         DateTimeFormat.forPattern(localDatePattern)
 
       def reads(json: JsValue): JsResult[LocalDate] = json match {
@@ -198,7 +209,7 @@ object BaseFormat {
           .opt(LocalDate.parse(input, df))
     }
   }
-  val localDateWrites: Writes[LocalDate] = {
+  private val localDateWrites: Writes[LocalDate] = {
     val df =
       org.joda.time.format.DateTimeFormat.forPattern(localDatePattern)
     Writes[LocalDate] { d =>
@@ -210,7 +221,7 @@ object BaseFormat {
 
   implicit object DateTimeZoneFormat extends Format[DateTimeZone] {
     def writes(zone: DateTimeZone): JsValue = {
-      JsString(zone.getID())
+      JsString(zone.getID)
     }
 
     def reads(json: JsValue): JsResult[DateTimeZone] = json match {

backend/app/models/Granularity.scala

@@ -21,17 +21,13 @@
 
 package models
 
-import ai.x.play.json.Jsonx
-import play.api.libs.json.Format
+import models.BaseFormat.enumFormat
+import play.api.libs.json._
 
 sealed trait Granularity {}
 
 object Granularity {
-  import ai.x.play.json.SingletonEncoder.simpleName
-  import ai.x.play.json.implicits.formatSingleton
-
-  implicit val format: Format[Granularity] =
-    Jsonx.formatSealed[Granularity]
+  implicit val format: Format[Granularity] = enumFormat[Granularity]
 }
 
 case object All   extends Granularity

backend/app/models/Invitation.scala

@@ -27,8 +27,8 @@ import models.ProjectId.ProjectReference
 import models.UserId.UserReference
 import org.joda.time.DateTime
 import play.api.libs.json._
-import models.BaseFormat._
 import play.api.libs.json.Format
+import models.BaseFormat._
 
 sealed trait Invitation extends BaseEntity[InvitationId] {
   val createDate: DateTime
@@ -39,7 +39,7 @@ sealed trait Invitation extends BaseEntity[InvitationId] {
 }
 
 object Invitation {
-  implicit val format =
+  implicit val format: OFormat[Invitation] =
     derived.flat.oformat[Invitation](BaseFormat.defaultTypeFormat)
 }
 

backend/app/models/InvitationOutcomeStatus.scala

@@ -21,17 +21,14 @@
 
 package models
 
-import ai.x.play.json._
+import models.BaseFormat.enumFormat
 import play.api.libs.json.Format
 
 sealed trait InvitationOutcomeStatus
 
 object InvitationOutcomeStatus {
-  import ai.x.play.json.SingletonEncoder.simpleName
-  import ai.x.play.json.implicits.formatSingleton
-
   implicit val format: Format[InvitationOutcomeStatus] =
-    Jsonx.formatSealed[InvitationOutcomeStatus]
+    enumFormat[InvitationOutcomeStatus]
 }
 
 case object InvitationAccepted extends InvitationOutcomeStatus

backend/app/models/InvitationStatusResponse.scala

@@ -21,18 +21,13 @@
 
 package models
 
-import ai.x.play.json.Jsonx
+import models.BaseFormat.enumFormat
 import play.api.libs.json.{Format, Json}
 
 sealed trait InvitationStatus
 
 object InvitationStatus {
-
-  import ai.x.play.json.SingletonEncoder.simpleName
-  import ai.x.play.json.implicits.formatSingleton
-
-  implicit val format: Format[InvitationStatus] =
-    Jsonx.formatSealed[InvitationStatus]
+  implicit val format: Format[InvitationStatus] = enumFormat[InvitationStatus]
 }
 
 case object UnregisteredUser extends InvitationStatus

backend/app/models/OrganisationRole.scala

@@ -20,7 +20,7 @@
  */
 
 package models
-import ai.x.play.json.Jsonx
+import models.BaseFormat.enumFormat
 import play.api.libs.json.Format
 
 sealed trait OrganisationRole
@@ -31,9 +31,5 @@ case object OrganisationAdministrator extends OrganisationRole
 
 object OrganisationRole {
 
-  import ai.x.play.json.SingletonEncoder.simpleName
-  import ai.x.play.json.implicits.formatSingleton
-
-  implicit val format: Format[OrganisationRole] =
-    Jsonx.formatSealed[OrganisationRole]
+  implicit val format: Format[OrganisationRole] = enumFormat[OrganisationRole]
 }

backend/app/models/Tags.scala

@@ -62,10 +62,11 @@ object SimpleTag {
 }
 
 object Tag {
-  implicit val tagWrites =
+  implicit val tagWrites: OWrites[Tag] =
     derived.flat.owrites[Tag](BaseFormat.defaultTypeFormat)
-  val defaultTagReads = derived.flat.reads[Tag](BaseFormat.defaultTypeFormat)
-  val tagReads = (JsPath \ "type").readNullable[String].flatMap {
+  private val defaultTagReads =
+    derived.flat.reads[Tag](BaseFormat.defaultTypeFormat)
+  private val tagReads = (JsPath \ "type").readNullable[String].flatMap {
     // by default map to "SimpleTag" to be compliant with old bookings based on TagId only
     case None =>
       JsPath().read[String].map[Tag](tag => SimpleTag(TagId(tag)))

backend/app/models/UserProject.scala

@@ -21,7 +21,7 @@
 
 package models
 
-import ai.x.play.json.Jsonx
+import models.BaseFormat.enumFormat
 import models.OrganisationId.OrganisationReference
 import models.ProjectId.ProjectReference
 import play.api.libs.json._
@@ -33,11 +33,7 @@ case object ProjectMember extends ProjectRole
 case object ProjectAdministrator extends ProjectRole
 
 object ProjectRole {
-
-  import ai.x.play.json.SingletonEncoder.simpleName
-  import ai.x.play.json.implicits.formatSingleton
-
-  implicit val format: Format[ProjectRole] = Jsonx.formatSealed[ProjectRole]
+  implicit val format: Format[ProjectRole] = enumFormat[ProjectRole]
 }
 
 case class UserProject(

backend/app/models/UserRole.scala

@@ -21,15 +21,13 @@
 
 package models
 
-import ai.x.play.json.Jsonx
+import models.BaseFormat.enumFormat
 import play.api.libs.json.Format
 
 sealed trait UserRole
 case object FreeUser      extends UserRole
 case object Administrator extends UserRole
 
 object UserRole {
-  import ai.x.play.json.SingletonEncoder.simpleName
-  import ai.x.play.json.implicits.formatSingleton
-  implicit val format: Format[UserRole] = Jsonx.formatSealed[UserRole]
+  implicit val format: Format[UserRole] = enumFormat[UserRole]
 }

backend/app/models/adapters/PersistedEventAdapter.scala

@@ -29,14 +29,14 @@ import play.modules.reactivemongo.ReactiveMongoApi
 import repositories.{ProjectRepository, UserRepository}
 
 import scala.annotation.nowarn
-import scala.concurrent.{Await, Awaitable}
+import scala.concurrent.{Await, Awaitable, ExecutionContextExecutor}
 import scala.concurrent.duration.DurationInt
 import scala.language.postfixOps
 
 class PersistedEventAdapter(system: ExtendedActorSystem)
     extends ReadEventAdapter {
 
-  implicit val executionContext = system.dispatcher
+  implicit val executionContext: ExecutionContextExecutor = system.dispatcher
 
   lazy val allUsers = {
     val reactiveMongoApi = PlayAkkaExtension(system)