Merge branch 'release/0.2.2'

Author: Sam Ritchie

.gitignore

@@ -28,6 +28,7 @@
 /src/intellij/*.iws
 /.cache
 /.idea
+/.idea_modules
 /.settings
 
 # bak files produced by ./cleanup-commit

CHANGES.md

@@ -1,5 +1,10 @@
 # chill #
 
+### 0.2.2
+
+* Custom RegexSerializer
+* ArrayBuffer serialization fix (#48)
+
 ### 0.2.1
 * Improve MeatLocker (safe to call get before serialization)
 * Fix a bug with serialization of mutable collections

README.md

@@ -44,7 +44,7 @@ Chill provides support for singletons, scala Objects and the following types:
 
 ## Maven
 
-Current version is `0.2.1 `. groupid=`"com.twitter"` artifact=`"chill_2.9.2"` or artifact=`"chill_2.10"`.
+Current version is `0.2.2`. groupid=`"com.twitter"` artifact=`"chill_2.9.2"` or artifact=`"chill_2.10"`.
 
 ## Authors
 

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

@@ -23,7 +23,7 @@ class InjectiveSerializer[T] private (injection: Injection[T, Array[Byte]]) exte
   def write(kser: Kryo, out: Output, obj: T) {
     val bytes = injection(obj)
     out.writeInt(bytes.length, true)
-    out.writeBytes(bytes);
+    out.writeBytes(bytes)
   }
 
   def read(kser: Kryo, in: Input, cls: Class[T]): T = {

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

@@ -19,19 +19,19 @@ package com.twitter.chill
 import com.esotericsoftware.kryo.Kryo
 import com.esotericsoftware.kryo.KryoException
 import com.esotericsoftware.kryo.{ Serializer => KSerializer }
-import com.esotericsoftware.reflectasm.ConstructorAccess;
+import com.esotericsoftware.reflectasm.ConstructorAccess
 import com.esotericsoftware.kryo.serializers.FieldSerializer
 
-import org.objenesis.instantiator.ObjectInstantiator;
-import org.objenesis.strategy.InstantiatorStrategy;
+import org.objenesis.instantiator.ObjectInstantiator
+import org.objenesis.strategy.InstantiatorStrategy
+
+import java.lang.reflect.Constructor
+import java.lang.reflect.Modifier
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
 /*
  * This is the base class of Kryo we use to fix specific scala
  * related issues discovered (ideally, this should be fixed in Kryo)
  */
-
 class KryoBase extends Kryo {
 
   lazy val objSer = new ObjectSerializer[AnyRef]

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

@@ -20,9 +20,7 @@ import com.esotericsoftware.kryo.Kryo
 import com.esotericsoftware.kryo.{ Serializer => KSerializer }
 import com.esotericsoftware.kryo.io.{ Input, Output }
 
-import com.twitter.bijection.{ Base64String, Bufferable, ImplicitBijection, Injection }
-
-import org.objenesis.strategy.StdInstantiatorStrategy
+import com.twitter.bijection.{ Bufferable, ImplicitBijection }
 
 import scala.collection.immutable.{
   BitSet,
@@ -32,14 +30,14 @@ import scala.collection.immutable.{
 }
 
 import scala.collection.mutable.{
-  Builder,
   WrappedArray,
   Map => MMap,
   Set => MSet,
   ListBuffer,
   Queue => MQueue,
   Buffer
 }
+import scala.util.matching.Regex
 
 object KryoSerializer {
 
@@ -88,13 +86,17 @@ object KryoSerializer {
      * You should go from MOST specific, to least to specific when using
      * default serializers. The FIRST one found is the one used
      */
-    // wrapper array is abstract
-    newK.forSubclass[WrappedArray[Any]](new WrappedArraySerializer[Any])
+    newK
+      .forSubclass[Regex](new RegexSerializer)
+      // wrapper array is abstract
+      .forSubclass[WrappedArray[Any]](new WrappedArraySerializer[Any])
       .forSubclass[BitSet](new BitSetSerializer)
       .forSubclass[java.util.PriorityQueue[AnyRef]](new PriorityQueueSerializer[AnyRef])
       .forTraversableSubclass(Queue.newBuilder[Any])
       // List is a sealed class, so there are only two subclasses:
       .forTraversableSubclass(List.newBuilder[Any])
+      // add mutable Buffer before Vector, otherwise Vector is used
+      .forTraversableSubclass(Buffer.newBuilder[Any], isImmutable = false)
       //Vector is a final class
       .forTraversableClass(Vector.newBuilder[Any])
       .forTraversableSubclass(IndexedSeq.newBuilder[Any])
@@ -109,7 +111,6 @@ object KryoSerializer {
       .forTraversableSubclass(MMap.newBuilder[Any,Any], isImmutable = false)
       .forTraversableSubclass(MSet.newBuilder[Any], isImmutable = false)
       .forTraversableSubclass(ListBuffer.newBuilder[Any], isImmutable = false)
-      .forTraversableSubclass(Buffer.newBuilder[Any], isImmutable = false)
       // This should be last, lots of things are seq/iterable/traversable
       // These are questionable and might break things.
       // rarely will you only expect an iterable/traversable on the reverse

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

@@ -0,0 +1,32 @@
+/*
+Copyright 2012 Twitter, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package com.twitter.chill
+
+import com.esotericsoftware.kryo.Kryo
+import com.esotericsoftware.kryo.{ Serializer => KSerializer }
+import com.esotericsoftware.kryo.io.{ Input, Output }
+import scala.util.matching.Regex
+
+class RegexSerializer extends KSerializer[Regex] {
+  def write(kser: Kryo, out: Output, obj: Regex) {
+    out.writeString(obj.pattern.pattern)
+  }
+
+  def read(kser: Kryo, in: Input, cls: Class[Regex]): Regex = {
+    new Regex(in.readString)
+  }
+}

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

@@ -22,7 +22,7 @@ import scala.collection.immutable.BitSet
 import scala.collection.immutable.ListMap
 import scala.collection.immutable.HashMap
 
-import scala.collection.mutable.{HashMap => MHashMap}
+import scala.collection.mutable.{ArrayBuffer => MArrayBuffer, HashMap => MHashMap}
 
 import com.twitter.bijection.Bijection
 
@@ -33,8 +33,8 @@ import com.twitter.bijection.Bijection
 */
 case class TestCaseClassForSerialization(x : String, y : Int)
 
-case class TestValMap(val map : Map[String,Double])
-case class TestValHashMap(val map : HashMap[String,Double])
+case class TestValMap(map: Map[String,Double])
+case class TestValHashMap(map: HashMap[String,Double])
 case class TestVarArgs(vargs: String*)
 
 object WeekDay extends Enumeration {
@@ -55,6 +55,7 @@ class KryoSpec extends Specification with BaseProperties {
                       0 to 100,
                       (0 to 42).toList, Seq(1,100,1000),
                       Map("good" -> 0.5, "bad" -> -1.0),
+                      MArrayBuffer(1,2,3,4,5),
                       List(Some(MHashMap(1->1, 2->2)), None, Some(MHashMap(3->4))),
                       Set(1,2,3,4,10),
                       BitSet(),
@@ -165,5 +166,11 @@ class KryoSpec extends Specification with BaseProperties {
       val ml = MeatLocker(l)
       jrt(ml).get must_==(l)
     }
+    "Handle Regex" in {
+      val test = """\bhilarious""".r
+      val roundtripped = rt(test)
+      roundtripped.pattern.pattern must be_==(test.pattern.pattern)
+      roundtripped.findFirstIn("hilarious").isDefined must beTrue
+    }
   }
 }

project/Build.scala

@@ -13,7 +13,7 @@ object ChillBuild extends Build {
   val sharedSettings = Project.defaultSettings ++
     mimaDefaultSettings ++ Seq(
 
-  version := "0.2.1",
+  version := "0.2.2",
 
   organization := "com.twitter",