Register all classes and fix the unit test issues

Registration is required by default in Kryo5:

https://github.com/EsotericSoftware/kryo/wiki/Migration-to-v5#configuration-changes

Author: roczei

chill-hadoop/src/test/scala/com/twitter/chill/hadoop/HadoopTests.scala

@@ -27,9 +27,19 @@ import com.twitter.chill.KryoInstantiator
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
+
+class AnyKryoInstantiator extends KryoInstantiator {
+  override def newKryo: Kryo = {
+    val k = new Kryo
+    k.register(Class.forName("com.twitter.chill.hadoop.HadoopTests"))
+    k.register(Class.forName("scala.collection.immutable.List"))
+    k
+  }
+}
 class StdKryoInstantiator extends KryoInstantiator {
   override def newKryo: Kryo = {
     val k = new Kryo
+    k.register(Class.forName("scala.Tuple2$mcII$sp"))
     k.setInstantiatorStrategy(new StdInstantiatorStrategy)
     k
   }
@@ -55,7 +65,7 @@ class HadoopTests extends AnyWordSpec with Matchers {
     "accept anything" in {
       val conf = new Configuration
       val hc = new HadoopConfig(conf)
-      ConfiguredInstantiator.setReflect(hc, classOf[KryoInstantiator])
+      ConfiguredInstantiator.setReflect(hc, classOf[AnyKryoInstantiator])
 
       val ks = new KryoSerialization(conf)
       Seq(classOf[List[_]], classOf[Int], this.getClass).forall { cls =>

chill-java/src/test/java/com/twitter/chill/java/TestCollections.java

@@ -43,8 +43,14 @@ public class TestCollections {
         test_map.put(4, "four");
     }
 
-    public static <T> T serializeAndDeserialize(T t) {
+    public static <T> T serializeAndDeserialize(T t) throws ClassNotFoundException {
         Output output = new Output(1000, -1);
+        kryo.register(Class.forName("java.util.ArrayList"));
+        kryo.register(Class.forName("java.util.LinkedList"));
+        kryo.register(Class.forName("java.util.HashMap"));
+        kryo.register(Class.forName("java.util.TreeMap"));
+        kryo.register(Class.forName("java.util.HashSet"));
+        kryo.register(Class.forName("java.util.TreeSet"));
         kryo.writeClassAndObject(output, t);
         Input input = new Input(output.toBytes());
         return (T) kryo.readClassAndObject(input);

chill-java/src/test/java/com/twitter/chill/java/TestLists.java

@@ -51,8 +51,9 @@ public class TestLists {
         ));
     }
 
-    public static <T> T serializeAndDeserialize(T t) {
+    public static <T> T serializeAndDeserialize(T t) throws ClassNotFoundException {
         Output output = new Output(1000, -1);
+        kryo.register(Class.forName("java.util.List"));
         kryo.writeClassAndObject(output, t);
         Input input = new Input(output.toBytes());
         return (T) kryo.readClassAndObject(input);

chill-java/src/test/scala/com/twitter/chill/config/ConfiguredInstantiatorTest.scala

@@ -27,6 +27,14 @@ import org.scalatest.wordspec.AnyWordSpec
 class TestInst extends KryoInstantiator { override def newKryo = new Kryo }
 class TestInstTwo extends KryoInstantiator { override def newKryo = new Kryo }
 
+class DefaultKryoInstantiator extends KryoInstantiator {
+  override def newKryo: Kryo = {
+    val k = new Kryo
+    k.setRegistrationRequired(false)
+    k
+  }
+}
+
 class ReflectingInstantiatorTest extends AnyWordSpec with Matchers {
   "A ConfiguredInstantiator" should {
     "work with a reflected instantiator" in {
@@ -38,15 +46,15 @@ class ReflectingInstantiatorTest extends AnyWordSpec with Matchers {
     }
     "work with a serialized instantiator" in {
       val conf = new JavaMapConfig
-      ConfiguredInstantiator.setSerialized(conf, new TestInst)
+      ConfiguredInstantiator.setSerialized(conf, classOf[DefaultKryoInstantiator], new TestInst)
       val cci = new ConfiguredInstantiator(conf)
       // Here is the only assert:
       cci.getDelegate.getClass should equal(classOf[TestInst])
       // Verify that caching is working:
       val cci2 = new ConfiguredInstantiator(conf)
       cci.getDelegate should equal(cci2.getDelegate)
       // Set a new serialized and verify caching is still correct:
-      ConfiguredInstantiator.setSerialized(conf, new TestInstTwo)
+      ConfiguredInstantiator.setSerialized(conf, classOf[DefaultKryoInstantiator], new TestInstTwo)
       val cci3 = new ConfiguredInstantiator(conf)
       cci3.getDelegate.getClass should equal(classOf[TestInstTwo])
       (cci3.getDelegate should not).equal(cci2.getDelegate)

chill-java/src/test/scala/com/twitter/chill/java/PriorityQueueTest.scala

@@ -37,6 +37,11 @@ class PriorityQueueTest extends AnyWordSpec with Matchers {
       import scala.collection.JavaConverters._
 
       val kryo = new Kryo()
+      kryo.register(Class.forName("scala.math.Ordering$$anon$9"))
+      kryo.register(
+        Class.forName("com.twitter.chill.java.PriorityQueueTest$$anonfun$1$$anonfun$apply$mcV$sp$1$$anonfun$2")
+      )
+      kryo.register(Class.forName("scala.Tuple2$mcII$sp"))
       kryo.setInstantiatorStrategy(new StdInstantiatorStrategy)
       PriorityQueueSerializer.registrar()(kryo)
       new Java8ClosureRegistrar()(kryo)

chill-protobuf/src/test/scala/com/twitter/chill/protobuf/ProtobufTest.scala

@@ -16,6 +16,7 @@
 
 package com.twitter.chill.protobuf
 
+import com.twitter.chill.java.UnmodifiableListSerializer
 import com.twitter.chill.{KryoInstantiator, KryoPool}
 import com.twitter.chill.protobuf.TestMessages.FatigueCount
 
@@ -44,6 +45,14 @@ class ProtobufTest extends AnyWordSpec with Matchers {
       new KryoInstantiator {
         override def newKryo(): Kryo = {
           val k = new Kryo
+          k.register(Class.forName("com.twitter.chill.protobuf.TestMessages$FatigueCount"))
+          k.register(Class.forName("java.util.ArrayList"))
+          k.register(
+            Class.forName("java.util.Collections$UnmodifiableRandomAccessList"),
+            new UnmodifiableListSerializer
+          )
+          k.register(Class.forName("com.google.protobuf.UnknownFieldSet"))
+          k.register(Class.forName("java.util.Collections$EmptyMap"))
           k.addDefaultSerializer(classOf[Message], classOf[ProtobufSerializer])
           k
         }