1 files changed, 3 insertions, 16 deletions
diff --git a/vfd-backend/app/controllers/Application.scala b/vfd-backend/app/controllers/Application.scala
index f048a07..6bd066d 100644
--- a/vfd-backend/app/controllers/Application.scala
+++ b/vfd-backend/app/controllers/Application.scala
@@ -1,5 +1,6 @@
 package controllers
 
+import util._
 import play.api._
 import play.api.mvc._
 import play.api.Play.current
@@ -21,22 +22,8 @@ object Application extends Controller {
     Ok(views.html.index())
   }
 
-  implicit object DataFrameFormat extends Format[DataFrame] {
-    import org.scalajs.spickling._
-    import org.scalajs.spickling.playjson._
-    import play.api.data.validation.ValidationError
-
-    PicklerRegistry.register[DataFrame]
-
-    def writes(o: DataFrame): JsValue = PicklerRegistry.pickle(o)
-
-    def reads(j: JsValue): JsResult[DataFrame] = PicklerRegistry.unpickle(j) match {
-      case df: DataFrame => JsSuccess(df)
-      case _ => JsError("unpickling yielded wrong type")
-    }
-  }
-
-  //implicit val dataFrameFormat = Json.format[DataFrame]
+  
+  implicit val dataFrameFormat = spicklerFormat[DataFrame]
   implicit val dataFrameFormatter = FrameFormatter.jsonFrame[DataFrame]
 
   def socket = WebSocket.acceptWithActor[String, DataFrame] { request =>