Merge pull request #159 from twitter/asjava

Support AsJava/AsScala

Author: ianoc

chill-scala/src/main/scala/com/twitter/chill/ScalaKryoInstantiator.scala

@@ -43,6 +43,8 @@ import scala.util.matching.Regex
 import com.twitter.chill.java.PackageRegistrar
 import _root_.java.io.Serializable
 
+import scala.collection.JavaConverters._
+
 /** This class has a no-arg constructor, suitable for use with reflection instantiation
  * It has no registered serializers, just the standard Kryo configured for Kryo.
  */
@@ -87,6 +89,19 @@ class ScalaKryoInstantiator extends EmptyScalaKryoInstantiator {
 
 class ScalaCollectionsRegistrar extends IKryoRegistrar {
   def apply(newK: Kryo) {
+    // for binary compat this is here, but could be moved to RichKryo
+    def useField[T](cls: Class[T]) {
+      val fs = new com.esotericsoftware.kryo.serializers.FieldSerializer(newK, cls)
+      fs.setIgnoreSyntheticFields(false) // scala generates a lot of these attributes
+      newK.register(cls, fs)
+    }
+    // The wrappers are private classes:
+    useField(List(1, 2, 3).asJava.getClass)
+    useField(List(1, 2, 3).iterator.asJava.getClass)
+    useField(Map(1 -> 2, 4 -> 3).asJava.getClass)
+    useField(new _root_.java.util.ArrayList().asScala.getClass)
+    useField(new _root_.java.util.HashMap().asScala.getClass)
+
     /*
      * Note that subclass-based use: addDefaultSerializers, else: register
      * You should go from MOST specific, to least to specific when using

chill-scala/src/test/scala/com/twitter/chill/KryoSpec.scala

@@ -23,6 +23,8 @@ import scala.collection.mutable.{ArrayBuffer => MArrayBuffer, HashMap => MHashMa
 import _root_.java.util.PriorityQueue
 import _root_.java.util.Locale
 import scala.collection.mutable
+import scala.collection.JavaConverters._
+
 /*
 * This is just a test case for Kryo to deal with. It should
 * be outside KryoSpec, otherwise the enclosing class, KryoSpec
@@ -85,6 +87,10 @@ class KryoSpec extends Specification with BaseProperties {
                       Vector(1,2,3,4,5),
                       TestValMap(null),
                       Some("junk"),
+                      List(1, 2, 3).asJava,
+                      Map("hey" -> 1, "you" -> 2).asJava,
+                      new _root_.java.util.ArrayList(Seq(1, 2, 3).asJava).asScala,
+                      new _root_.java.util.HashMap[Int,Int](Map(1 -> 2, 3 -> 4).asJava).asScala,
                       (),
                       'hai)
         .asInstanceOf[List[AnyRef]]