Merge branch 'release/0.3.6'

Author: Jonathan Coveney

CHANGES.md

@@ -1,11 +1,23 @@
 # chill #
 
+### 0.3.6
+* Add ScalaAnyRefMapConfig, deals with non-string keys in cascading: https://github.com/twitter/chill/pull/174
+* added AvroSerializer: https://github.com/twitter/chill/pull/172
+* Add sbt script for homogeneity with SB, Scalding, etc: https://github.com/twitter/chill/pull/170
+* Support for akka 2.2.1: https://github.com/twitter/chill/pull/169
+* Protobuf should be in the all target: https://github.com/twitter/chill/pull/168
+* Enable getClass equality checking in tests: https://github.com/twitter/chill/pull/165
+* Add chill-protobuf, with tests: https://github.com/twitter/chill/pull/163
+* support serialization of scala sortedmap: https://github.com/twitter/chill/pull/162
+
 ### 0.3.5
-* Add Serializers for scala SortedList and ListSet. https://github.com/twitter/chill/pull/152
+* Add Serializers for scala SortedList and ListSet: https://github.com/twitter/chill/pull/152
 * Fix Range serialization (and remove broken subclass-serialization of Iterable, Seq, etc): https://github.com/twitter/chill/pull/154
 * Build and test chill-akka for 2.10: https://github.com/twitter/chill/pull/155
 * Add chill-thrift: https://github.com/twitter/chill/pull/156
 * Support JavaConverter-built classes: https://github.com/twitter/chill/pull/159
+* Back to 2.21: https://github.com/twitter/chill/pull/157
+* Adds a test from issue #8: https://github.com/twitter/chill/pull/158
 
 ### 0.3.4
 * Bugfixes for Externalizer with looped object graphs https://github.com/twitter/chill/pull/143

README.md

@@ -147,7 +147,7 @@ Discussion occurs primarily on the [Chill mailing list](https://groups.google.co
 
 ## Maven
 
-Chill modules are available on Maven Central. The current groupid and version for all modules is, respectively, `"com.twitter"` and  `0.3.5`.
+Chill modules are available on Maven Central. The current groupid and version for all modules is, respectively, `"com.twitter"` and  `0.3.6`.
 
 Current published artifacts are
 

chill-akka/src/main/scala/com/twitter/chill/akka/ActorRefSerializer.scala

@@ -47,9 +47,6 @@ class ActorRefSerializer(system: ExtendedActorSystem) extends Serializer[ActorRe
 	}
 
 	override def write(kryo: Kryo, output: Output, obj: ActorRef) = {
-		Serialization.currentTransportAddress.value match {
-			case null => output.writeString(obj.path.toString)
-			case addr => output.writeString(obj.path.toStringWithAddress(addr))
-		}
+    output.writeString(Serialization.serializedActorPath(obj))
 	}
 }

chill-akka/src/test/scala/com/twitter/chill/akka/AkkaTests.scala

@@ -46,5 +46,23 @@ class AkkaTests extends Specification {
       val serializer = serialization.findSerializerFor((1,2,3))
       serializer.getClass.equals(classOf[AkkaSerializer]) must beTrue
     }
+
+    "be selected for ActorRef" in {
+      val serializer = serialization.findSerializerFor(system.actorFor("akka://test-system/test-actor"))
+      serializer.getClass.equals(classOf[AkkaSerializer]) must beTrue
+    }
+
+    "serialize and deserialize ActorRef successfully" in {
+      val actorRef = system.actorFor("akka://test-system/test-actor")
+
+      val serialized = serialization.serialize(actorRef)
+      serialized.isSuccess must beTrue
+
+      val deserialized = serialization.deserialize(serialized.get, classOf[ActorRef])
+      deserialized.isSuccess must beTrue
+
+      deserialized.get.equals(actorRef) must beTrue
+    }
+
   }
 }

chill-avro/src/main/scala/com/twitter/chill/avro/AvroSerializer.scala

@@ -0,0 +1,45 @@
+/*
+
+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.avro
+
+import org.apache.avro.specific.SpecificRecordBase
+import com.twitter.chill.{InjectiveSerializer, KSerializer}
+import com.twitter.bijection.avro.SpecificAvroCodecs
+import org.apache.avro.Schema
+import com.twitter.bijection.Injection
+
+/**
+ * @author Mansur Ashraf
+ * @since 2/9/14.
+ */
+object AvroSerializer {
+
+  def SpecificRecordSerializer[T <: SpecificRecordBase : Manifest]: KSerializer[T] = {
+    implicit val inj = SpecificAvroCodecs[T]
+    InjectiveSerializer.asKryo
+  }
+
+  def SpecificRecordBinarySerializer[T <: SpecificRecordBase : Manifest]: KSerializer[T] = {
+    implicit val inj = SpecificAvroCodecs.toBinary[T]
+    InjectiveSerializer.asKryo
+  }
+
+  def SpecificRecordJsonSerializer[T <: SpecificRecordBase : Manifest](schema: Schema): KSerializer[T] = {
+    import com.twitter.bijection.StringCodec.utf8
+    implicit val inj = SpecificAvroCodecs.toJson[T](schema)
+    implicit val avroToArray = Injection.connect[T, String, Array[Byte]]
+    InjectiveSerializer.asKryo
+  }
+}