From 57444b0f0511d9ce9460661bca97ea3ac7873bd7 Mon Sep 17 00:00:00 2001 From: Ian O Connell Date: Fri, 1 Nov 2013 22:04:31 -0700 Subject: [PATCH] Kryo 2.22, udpate references to shaded jar --- .../java/com/twitter/chill/hadoop/KryoSerialization.java | 2 +- .../test/scala/com/twitter/chill/hadoop/HadoopTests.scala | 2 +- .../src/main/java/com/twitter/chill/KryoInstantiator.java | 2 +- .../com/twitter/chill/config/ReflectingInstantiator.java | 6 +++--- .../src/test/scala/com/twitter/chill/java/LocaleTest.scala | 2 +- .../scala/com/twitter/chill/java/PriorityQueueTest.scala | 2 +- chill-scala/src/main/scala/com/twitter/chill/KryoBase.scala | 4 ++-- .../scala/com/twitter/chill/ScalaKryoInstantiator.scala | 2 +- .../chill/config/ReflectingInstantiatorBuilder.scala | 4 ++-- .../twitter/chill/config/ReflectingInstantiatorTest.scala | 4 ++-- project/Build.scala | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/chill-hadoop/src/main/java/com/twitter/chill/hadoop/KryoSerialization.java b/chill-hadoop/src/main/java/com/twitter/chill/hadoop/KryoSerialization.java index 60dd3d8f..8d13cb8c 100644 --- a/chill-hadoop/src/main/java/com/twitter/chill/hadoop/KryoSerialization.java +++ b/chill-hadoop/src/main/java/com/twitter/chill/hadoop/KryoSerialization.java @@ -24,7 +24,7 @@ import org.apache.hadoop.io.serializer.Deserializer; import org.apache.hadoop.io.serializer.Serialization; import org.apache.hadoop.io.serializer.Serializer; -import org.objenesis.strategy.StdInstantiatorStrategy; +import com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy; import com.twitter.chill.KryoPool; import com.twitter.chill.KryoInstantiator; diff --git a/chill-hadoop/src/test/scala/com/twitter/chill/hadoop/HadoopTests.scala b/chill-hadoop/src/test/scala/com/twitter/chill/hadoop/HadoopTests.scala index 87a9fea3..ea2654ef 100644 --- a/chill-hadoop/src/test/scala/com/twitter/chill/hadoop/HadoopTests.scala +++ b/chill-hadoop/src/test/scala/com/twitter/chill/hadoop/HadoopTests.scala @@ -22,7 +22,7 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import org.objenesis.strategy.StdInstantiatorStrategy +import com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy import java.io.{ByteArrayOutputStream => BAOut, ByteArrayInputStream => BAIn} import org.apache.hadoop.conf.Configuration; diff --git a/chill-java/src/main/java/com/twitter/chill/KryoInstantiator.java b/chill-java/src/main/java/com/twitter/chill/KryoInstantiator.java index c93b3138..35c0dfc2 100644 --- a/chill-java/src/main/java/com/twitter/chill/KryoInstantiator.java +++ b/chill-java/src/main/java/com/twitter/chill/KryoInstantiator.java @@ -17,7 +17,7 @@ package com.twitter.chill; import com.esotericsoftware.kryo.Kryo; -import org.objenesis.strategy.InstantiatorStrategy; +import com.esotericsoftware.shaded.org.objenesis.strategy.InstantiatorStrategy; import java.io.Serializable; /** Class to create a new Kryo instance. diff --git a/chill-java/src/main/java/com/twitter/chill/config/ReflectingInstantiator.java b/chill-java/src/main/java/com/twitter/chill/config/ReflectingInstantiator.java index 23fbb53f..e883f9d3 100644 --- a/chill-java/src/main/java/com/twitter/chill/config/ReflectingInstantiator.java +++ b/chill-java/src/main/java/com/twitter/chill/config/ReflectingInstantiator.java @@ -24,8 +24,8 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; -import org.objenesis.strategy.InstantiatorStrategy; -import org.objenesis.strategy.StdInstantiatorStrategy; +import com.esotericsoftware.shaded.org.objenesis.strategy.InstantiatorStrategy; +import com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy; import java.util.ArrayList; import java.util.List; import java.lang.reflect.InvocationTargetException; @@ -138,7 +138,7 @@ public Kryo newKryo() { public static final String KRYO_CLASS_DEFAULT = Kryo.class.getName(); /** * Name of the InstatiatorStrategy to use. - * If this is empty, we use org.objenesis.strategy.StdInstantiatorStrategy + * If this is empty, we use com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy */ public static final String INSTANTIATOR_STRATEGY_CLASS = prefix + ".instantiatorstrategyclass"; public static final String INSTANTIATOR_STRATEGY_CLASS_DEFAULT = StdInstantiatorStrategy.class.getName(); diff --git a/chill-java/src/test/scala/com/twitter/chill/java/LocaleTest.scala b/chill-java/src/test/scala/com/twitter/chill/java/LocaleTest.scala index 0b8f53cd..21755f2c 100644 --- a/chill-java/src/test/scala/com/twitter/chill/java/LocaleTest.scala +++ b/chill-java/src/test/scala/com/twitter/chill/java/LocaleTest.scala @@ -22,7 +22,7 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import org.objenesis.strategy.StdInstantiatorStrategy +import com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy import _root_.java.util.Locale diff --git a/chill-java/src/test/scala/com/twitter/chill/java/PriorityQueueTest.scala b/chill-java/src/test/scala/com/twitter/chill/java/PriorityQueueTest.scala index 1c811d11..ca5a283a 100644 --- a/chill-java/src/test/scala/com/twitter/chill/java/PriorityQueueTest.scala +++ b/chill-java/src/test/scala/com/twitter/chill/java/PriorityQueueTest.scala @@ -22,7 +22,7 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import org.objenesis.strategy.StdInstantiatorStrategy +import com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy class PriorityQueueSpec extends Specification { noDetailedDiffs() //Fixes issue for scala 2.9 diff --git a/chill-scala/src/main/scala/com/twitter/chill/KryoBase.scala b/chill-scala/src/main/scala/com/twitter/chill/KryoBase.scala index b800412d..db444c5e 100644 --- a/chill-scala/src/main/scala/com/twitter/chill/KryoBase.scala +++ b/chill-scala/src/main/scala/com/twitter/chill/KryoBase.scala @@ -20,8 +20,8 @@ import com.esotericsoftware.kryo.KryoException import com.esotericsoftware.reflectasm.ConstructorAccess import com.esotericsoftware.kryo.serializers.FieldSerializer -import org.objenesis.instantiator.ObjectInstantiator -import org.objenesis.strategy.InstantiatorStrategy +import com.esotericsoftware.shaded.org.objenesis.instantiator.ObjectInstantiator +import com.esotericsoftware.shaded.org.objenesis.strategy.InstantiatorStrategy import _root_.java.lang.reflect.{Constructor, Modifier} diff --git a/chill-scala/src/main/scala/com/twitter/chill/ScalaKryoInstantiator.scala b/chill-scala/src/main/scala/com/twitter/chill/ScalaKryoInstantiator.scala index 156a7e76..34e8c1a0 100644 --- a/chill-scala/src/main/scala/com/twitter/chill/ScalaKryoInstantiator.scala +++ b/chill-scala/src/main/scala/com/twitter/chill/ScalaKryoInstantiator.scala @@ -46,7 +46,7 @@ class EmptyScalaKryoInstantiator extends KryoInstantiator { override def newKryo = { val k = new KryoBase k.setRegistrationRequired(false) - k.setInstantiatorStrategy(new org.objenesis.strategy.StdInstantiatorStrategy) + k.setInstantiatorStrategy(new com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy) k } } diff --git a/chill-scala/src/main/scala/com/twitter/chill/config/ReflectingInstantiatorBuilder.scala b/chill-scala/src/main/scala/com/twitter/chill/config/ReflectingInstantiatorBuilder.scala index e85f5eb2..34abadb7 100644 --- a/chill-scala/src/main/scala/com/twitter/chill/config/ReflectingInstantiatorBuilder.scala +++ b/chill-scala/src/main/scala/com/twitter/chill/config/ReflectingInstantiatorBuilder.scala @@ -19,8 +19,8 @@ package com.twitter.chill.config import com.twitter.chill._ import com.esotericsoftware.kryo.Kryo; -import org.objenesis.strategy.InstantiatorStrategy; -import org.objenesis.strategy.StdInstantiatorStrategy; +import com.esotericsoftware.shaded.org.objenesis.strategy.InstantiatorStrategy; +import com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy; import scala.collection.JavaConverters._ diff --git a/chill-scala/src/test/scala/com/twitter/chill/config/ReflectingInstantiatorTest.scala b/chill-scala/src/test/scala/com/twitter/chill/config/ReflectingInstantiatorTest.scala index 9c3c28ce..59b46518 100644 --- a/chill-scala/src/test/scala/com/twitter/chill/config/ReflectingInstantiatorTest.scala +++ b/chill-scala/src/test/scala/com/twitter/chill/config/ReflectingInstantiatorTest.scala @@ -20,8 +20,8 @@ import org.specs._ import com.twitter.chill.config._ -import org.objenesis.strategy.InstantiatorStrategy; -import org.objenesis.strategy.StdInstantiatorStrategy; +import com.esotericsoftware.shaded.org.objenesis.strategy.InstantiatorStrategy; +import com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy; class ReflectingInstantiatorTest extends Specification { diff --git a/project/Build.scala b/project/Build.scala index b9297517..ca4b2600 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -8,7 +8,7 @@ import com.typesafe.tools.mima.plugin.MimaKeys._ import scala.collection.JavaConverters._ object ChillBuild extends Build { - val kryoVersion = "2.21" + val kryoVersion = "2.22" val sharedSettings = Project.defaultSettings ++ mimaDefaultSettings ++ Seq(