twosigma#5798 Use Any instead of AnyRef in TableDisplay

jpallas · Aug 25, 2017 · 2a623d8 · 2a623d8
1 parent d457aaa
commit 2a623d8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/doc/contents/scala/tableApiScala.ipynb b/doc/contents/scala/tableApiScala.ipynb
@@ -138,8 +138,6 @@
     "val map = Seq(Map(\"a\" -> 1, \"b\" -> 2, \"c\" -> 3),\n",
     "               Map(\"a\" -> 4, \"b\" -> 5, \"c\" -> 6),\n",
     "               Map(\"a\" -> 7, \"b\" -> 8, \"c\" -> 9))\n",
-    "// TODO: remove when TableDisplay interface is fixed\n",
-    "            .map(_.mapValues(_.asInstanceOf[AnyRef]))\n",
     "\n",
     "val display5 = new TableDisplay(map)\n",
     "\n",
@@ -214,8 +212,6 @@
     "   Map(\"a\" -> 4, \"b\" -> 5, \"c\" -> 6),\n",
     "   Map(\"a\" -> 7, \"b\" -> 8, \"c\" -> 9)\n",
     ")\n",
-    "// TODO: remove when TableDisplay interface is fixed\n",
-    " .map(_.mapValues(_.asInstanceOf[AnyRef]))\n",
     "\n",
     "val display7 = new TableDisplay(mapList4)\n",
     "\n",
@@ -247,8 +243,6 @@
     "   Map(\"a\" -> 4, \"b\" -> 5, \"c\" -> 6),\n",
     "   Map(\"a\" -> 7, \"b\" -> 8, \"c\" -> 9)\n",
     ")\n",
-    "// TODO: remove when TableDisplay interface is fixed\n",
-    " .map(_.mapValues(_.asInstanceOf[AnyRef]))\n",
     "\n",
     "val display7 = new TableDisplay(mapList4)\n",
     "\n",
@@ -281,8 +275,6 @@
     " Map(\"firstCol\" -> 1, \"secondCol\" -> 2, \"thirdCol\" -> 3),\n",
     " Map(\"firstCol\" -> 4, \"secondCol\" -> 5, \"thirdCol\" -> 6),\n",
     " Map(\"firstCol\" -> 9, \"secondCol\" -> 8, \"thirdCol\" -> 7))\n",
-    "// TODO: remove when TableDisplay interface is fixed\n",
-    "    .map(_.mapValues(_.asInstanceOf[AnyRef]))\n",
     "\n",
     "val td4 = new TableDisplay(mapList5)\n",
     "\n",
@@ -331,9 +323,7 @@
     "   Map(\"a\" -> 1, \"b\" -> 2, \"c\" -> 3),\n",
     "   Map(\"a\" -> 4, \"b\" -> 5, \"c\" -> 6),\n",
     "   Map(\"a\" -> 7, \"b\" -> 8, \"c\" -> 8)\n",
-    ")\n",
-    "// TODO: remove when TableDisplay interface is fixed\n",
-    " .map(_.mapValues(_.asInstanceOf[AnyRef]))"
+    ")"
    ]
   },
   {

diff --git a/kernel/scala/src/main/java/com/twosigma/beakerx/scala/table/TableDisplay.scala b/kernel/scala/src/main/java/com/twosigma/beakerx/scala/table/TableDisplay.scala
@@ -39,22 +39,22 @@ object TableDisplay {
     new com.twosigma.beakerx.table.TableDisplay(javaListOfList, co.asJava, cl.asJava)
   }
 
-  private def create(v: Array[Map[String, AnyRef]]): com.twosigma.beakerx.table.TableDisplay = {
-    val javaStandardized: Array[java.util.Map[String, AnyRef]] = v.map(v => v.asJava).toArray
+  private def create(v: Array[Map[String, Any]]): com.twosigma.beakerx.table.TableDisplay = {
+    val javaStandardized: Array[java.util.Map[String, Object]] = v.map(v => v.mapValues(_.asInstanceOf[Object]).asJava)
 
     new com.twosigma.beakerx.table.TableDisplay(javaStandardized)
   }
 
-  private def create(v: Seq[Map[String, AnyRef]]): com.twosigma.beakerx.table.TableDisplay = {
-    val javaMaps: Seq[java.util.Map[String, AnyRef]] = v.map(entry => entry.asJava)
-    val javaCollection: java.util.Collection[java.util.Map[String, AnyRef]] = javaMaps.asJavaCollection
+  private def create(v: Seq[Map[String, Any]]): com.twosigma.beakerx.table.TableDisplay = {
+    val javaMaps: Seq[java.util.Map[String, Object]] = v.map(m => m.mapValues(_.asInstanceOf[Object]).asJava)
+    val javaCollection: java.util.Collection[java.util.Map[String, Object]] = javaMaps.asJava
 
     new com.twosigma.beakerx.table.TableDisplay(javaCollection)
   }
 
-  private def create(v: Seq[Map[String, AnyRef]], serializer: BeakerObjectConverter): com.twosigma.beakerx.table.TableDisplay = {
-    val javaMaps: Seq[java.util.Map[String, AnyRef]] = v.map(entry => entry.asJava)
-    val javaCollection: java.util.Collection[java.util.Map[String, AnyRef]] = javaMaps.asJavaCollection
+  private def create(v: Seq[Map[String, Any]], serializer: BeakerObjectConverter): com.twosigma.beakerx.table.TableDisplay = {
+    val javaMaps: Seq[java.util.Map[String, Object]] = v.map(m => m.mapValues(_.asInstanceOf[Object]).asJava)
+    val javaCollection: java.util.Collection[java.util.Map[String, Object]] = javaMaps.asJava
 
     new com.twosigma.beakerx.table.TableDisplay(javaCollection, serializer)
   }
@@ -70,15 +70,15 @@ class TableDisplay private(tableDisplay: com.twosigma.beakerx.table.TableDisplay
     this(TableDisplay.create(v, co, cl))
   }
 
-  def this(v: Array[Map[String, AnyRef]]) = {
+  def this(v: Array[Map[String, Any]]) = {
     this(TableDisplay.create(v))
   }
 
-  def this(v: Seq[Map[String, AnyRef]]) = {
+  def this(v: Seq[Map[String, Any]]) = {
     this(TableDisplay.create(v))
   }
 
-  def this(v: Seq[Map[String, AnyRef]], serializer: BeakerObjectConverter) = {
+  def this(v: Seq[Map[String, Any]], serializer: BeakerObjectConverter) = {
     this(TableDisplay.create(v, serializer))
   }