Merge pull request #174 from twitter/jco/anyrefmap

Add ScalaAnyRefMapConfig, deals with non-string keys in cascading

Author: johnynek

chill-scala/src/main/scala/com/twitter/chill/config/ScalaAnyRefMapConfig.scala

@@ -0,0 +1,40 @@
+/*
+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.config
+
+object ScalaAnyRefMapConfig {
+  def apply(m: Map[_ <: AnyRef, _ <: AnyRef]): ScalaAnyRefMapConfig =
+    new ScalaAnyRefMapConfig(m.map { case (k, v) => (k.asInstanceOf[AnyRef], v.asInstanceOf[AnyRef]) })
+  def empty: ScalaAnyRefMapConfig = new ScalaAnyRefMapConfig(Map.empty)
+}
+
+/** A simple config backed by an immutable Map. Note that this replaces ScalaMapConfig because
+ *  in cascading non-string values are perfectly legal.
+ */
+class ScalaAnyRefMapConfig(in: Map[AnyRef, AnyRef]) extends Config {
+  private var conf = in
+
+  def toMap: Map[AnyRef, AnyRef] = conf
+
+  override def get(k: String) = conf.get(k).map { _.toString }.getOrElse(null)
+  override def set(k: String, v: String) {
+    Option(v) match {
+      case Some(r) => conf += k -> v
+      case None => conf -= k
+    }
+  }
+}

chill-scala/src/main/scala/com/twitter/chill/config/ScalaMapConfig.scala

@@ -23,6 +23,7 @@ object ScalaMapConfig {
 
 /** A simple config backed by an immutable Map
  */
+@deprecated("Class potentially unsafe, use ScalaAnyRefMapConfig", "0.3.6")
 class ScalaMapConfig(in: Map[String, String]) extends Config {
   private var conf = in
 

chill-scala/src/test/scala/com/twitter/chill/config/ReflectingInstantiatorTest.scala

@@ -35,18 +35,18 @@ class ReflectingInstantiatorTest extends Specification {
         skipMissing = true,
         registrationRequired = true).build
 
-      val conf = ScalaMapConfig.empty
+      val conf = ScalaAnyRefMapConfig.empty
       ri.set(conf)
 
       conf.toMap(ReflectingInstantiator.KRYO_CLASS) must be_==(classOf[Kryo].getName)
       conf.toMap(ReflectingInstantiator.INSTANTIATOR_STRATEGY_CLASS) must be_==(classOf[InstantiatorStrategy].getName)
       conf.toMap(ReflectingInstantiator.REGISTRATION_REQUIRED) must be_==("true")
       conf.toMap(ReflectingInstantiator.SKIP_MISSING) must be_==("true")
-      conf.toMap(ReflectingInstantiator.REGISTRATIONS).split(":").toSet must be_== (
+      conf.toMap(ReflectingInstantiator.REGISTRATIONS).asInstanceOf[String].split(":").toSet must be_== (
         Set("scala.collection.immutable.List",
           "scala.collection.immutable.List,com.esotericsoftware.kryo.serializers.JavaSerializer")
       )
-      conf.toMap(ReflectingInstantiator.DEFAULT_REGISTRATIONS).split(":").toSet must be_== (
+      conf.toMap(ReflectingInstantiator.DEFAULT_REGISTRATIONS).asInstanceOf[String].split(":").toSet must be_== (
         Set("scala.collection.immutable.List,com.esotericsoftware.kryo.serializers.JavaSerializer")
       )
     }
@@ -58,7 +58,7 @@ class ReflectingInstantiatorTest extends Specification {
         skipMissing = true,
         registrationRequired = true).build
 
-      val conf = ScalaMapConfig.empty
+      val conf = ScalaAnyRefMapConfig.empty
       ri.set(conf)
       val ri2 = new ReflectingInstantiator(conf)
       ri.equals(ri2) must be_==(true)