Merge branch 'release/0.7.2'

Author: ianoc

.travis.yml

@@ -3,3 +3,7 @@ sudo: false
 scala:
   - 2.10.5
   - 2.11.7
+jdk:
+  - openjdk6
+  - oraclejdk7
+  - oraclejdk8

CHANGES.md

@@ -1,5 +1,13 @@
 # chill #
 
+### 0.7.2 ###
+* Setting the class loader by default: https://github.com/twitter/chill/pull/242
+
+### 0.7.1 ###
+* Add testing support for Java 6, 7 and 8.
+* Adds two Injection's to lift T into an Externalizer of T.
+* Protobuf module is Java only.
+
 ### 0.7.0 ###
 * Adds Scrooge 2.11 support now that the artifact is out, sets up for c…: https://github.com/twitter/chill/pull/236
 * make chill 1.6 compatible: https://github.com/twitter/chill/pull/231

README.md

@@ -159,7 +159,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.6.0` and each scala project is published for `2.10` and `2.11`. Search [search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cchill) when in doubt.
+Chill modules are available on Maven Central. The current groupid and version for all modules is, respectively, `"com.twitter"` and  `0.7.2` and each scala project is published for `2.10` and `2.11`. Search [search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cchill) when in doubt.
 
 ## Authors
 

chill-bijection/src/main/scala/com/twitter/chill/ExternalizerCodec.scala

@@ -0,0 +1,51 @@
+/*
+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 _root_.java.io.{
+  ByteArrayOutputStream,
+  ByteArrayInputStream,
+  ObjectInputStream,
+  ObjectOutputStream
+}
+
+import com.twitter.bijection.Injection
+import scala.util.Try
+
+/**
+ * A Injection to serialize an externalizer to bytes
+ *
+ * This method isn't safe since calling get on an Externalizer[T] could still throw despite the inversion
+ * here having worked as advertized. Since it is at the point of the get we unpack the inner box.
+ */
+object ExternalizerCodec {
+  implicit def apply[T]: ExternalizerCodec[T] = new ExternalizerCodec[T]
+}
+
+class ExternalizerCodec[T] extends Injection[Externalizer[T], Array[Byte]] {
+  def apply(extern: Externalizer[T]): Array[Byte] = {
+    val baos = new ByteArrayOutputStream()
+    val oos = new ObjectOutputStream(baos)
+    oos.writeObject(extern)
+    baos.toByteArray
+  }
+  def invert(bytes: Array[Byte]): Try[Externalizer[T]] = Try {
+    val testInput = new ByteArrayInputStream(bytes)
+    val ois = new ObjectInputStream(testInput)
+    ois.readObject.asInstanceOf[Externalizer[T]] // this may throw
+  }
+}

chill-bijection/src/main/scala/com/twitter/chill/ExternalizerInjection.scala

@@ -0,0 +1,45 @@
+/*
+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 _root_.java.io.{
+  ByteArrayOutputStream,
+  ByteArrayInputStream,
+  ObjectInputStream,
+  ObjectOutputStream
+}
+
+import com.twitter.bijection.Injection
+import scala.util.Try
+
+/**
+ * An Injection to lift a type T into an Externalizer
+ */
+object ExternalizerInjection {
+  implicit def builder[T]: ExternalizerInjection[T] = apply[T]
+
+  def apply[T]: ExternalizerInjection[T] = new ExternalizerInjection[T]
+}
+
+class ExternalizerInjection[T] extends Injection[T, Externalizer[T]] {
+  def apply(t: T): Externalizer[T] = {
+    Externalizer(t)
+  }
+  def invert(extern: Externalizer[T]): Try[T] = Try {
+    extern.get
+  }
+}

chill-bijection/src/test/scala/com/twitter/chill/ExternalizerCodecSpec.scala

@@ -0,0 +1,55 @@
+/*
+ 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 org.scalatest._
+
+import com.twitter.bijection.Injection
+import scala.util.Try
+
+class NotSerializable {
+  val x = "abcd"
+  override def equals(other: Any): Boolean =
+    other match {
+      case i: NotSerializable => true
+      case _ => false
+    }
+}
+class ExternalizerCodecSpec extends WordSpec {
+  import ExternalizerCodec._
+  import ExternalizerInjection._
+
+  def rt[T: ExternalizerInjection: ExternalizerCodec](t: T): Try[T] = {
+    val connectedInj = Injection.connect[T, Externalizer[T], Array[Byte]]
+    connectedInj.invert(connectedInj(t))
+  }
+
+  "The codec on Externalizer" should {
+    "round trip objects" in {
+      val x = rt(() => Foo.Bar).get
+      assert(x() == Foo.Bar)
+    }
+    "round not serializable classes" in {
+      val baseSerializable = new NotSerializable
+      val x = rt(baseSerializable).get
+      assert(x == baseSerializable, "Should be value equal")
+      assert(x ne baseSerializable, "Should not be reference equal, since through a serializer")
+    }
+
+  }
+}
+

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

@@ -57,6 +57,12 @@ class EmptyScalaKryoInstantiator extends KryoInstantiator {
     val k = new KryoBase
     k.setRegistrationRequired(false)
     k.setInstantiatorStrategy(new org.objenesis.strategy.StdInstantiatorStrategy)
+
+    // Handle cases where we may have an odd classloader setup like with libjars
+    // for hadoop
+    val classLoader = Thread.currentThread.getContextClassLoader
+    k.setClassLoader(classLoader)
+
     k
   }
 }

project/Build.scala

@@ -119,14 +119,14 @@ object ChillBuild extends Build {
     * with the current.
     */
   val unreleasedModules = Set[String]("akka")
-  val javaOnly = Set[String]("storm", "java", "hadoop", "thrift")
+  val javaOnly = Set[String]("storm", "java", "hadoop", "thrift", "protobuf")
 
   def youngestForwardCompatible(subProj: String) =
     Some(subProj)
       .filterNot(unreleasedModules.contains(_))
       .map { s =>
       val suffix = if (javaOnly.contains(s)) "" else "_2.10"
-      "com.twitter" % ("chill-" + s + suffix) % "0.6.0"
+      "com.twitter" % ("chill-" + s + suffix) % "0.7.1"
     }
 
   def module(name: String) = {
@@ -136,7 +136,7 @@ object ChillBuild extends Build {
       previousArtifact := youngestForwardCompatible(name),
       // Disable cross publishing for java artifacts
       publishArtifact <<= (scalaVersion) { scalaVersion =>
-        if(javaOnly.contains(name) && scalaVersion.startsWith("2.10")) false else true
+        if(javaOnly.contains(name) && scalaVersion.startsWith("2.11")) false else true
       }
       )
     )

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.8
+sbt.version=0.13.9