Merge pull request #224 from bkirwi/threadsafe-json-injections

En-threadsafe json injections for collections
twitter · Jul 20, 2015 · 32f24a9 · 32f24a9
2 parents bc964c9 + 3f1cfb7
commit 32f24a9
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/bijection-json/src/main/scala/com/twitter/bijection/json/JsonInjection.scala b/bijection-json/src/main/scala/com/twitter/bijection/json/JsonInjection.scala
@@ -127,18 +127,15 @@ object JsonNodeInjection extends LowPriorityJson with java.io.Serializable {
   }
 
   // This causes diverging implicits
-  def collectionJson[T, C <: Traversable[T]](implicit cbf: CanBuildFrom[Nothing, T, C],
-    jbij: JsonNodeInjection[T]): JsonNodeInjection[C] = fromBuilder(cbf())
-
-  def fromBuilder[T, C <: Traversable[T]](builder: Builder[T, C])(implicit jbij: JsonNodeInjection[T]): JsonNodeInjection[C] =
+  def collectionJson[T, C <: Traversable[T]](implicit cbf: CanBuildFrom[Nothing, T, C], jbij: JsonNodeInjection[T]): JsonNodeInjection[C] =
     new AbstractJsonNodeInjection[C] {
       def apply(l: C) = {
         val ary = JsonNodeFactory.instance.arrayNode
         l foreach { t => ary.add(jbij(t)) }
         ary
       }
       override def invert(n: JsonNode): Try[C] = {
-        builder.clear
+        val builder = cbf()
         var inCount = 0
         n.getElements.asScala.foreach { jn =>
           inCount += 1
@@ -154,19 +151,19 @@ object JsonNodeInjection extends LowPriorityJson with java.io.Serializable {
     }
 
   implicit def listJson[T: JsonNodeInjection]: JsonNodeInjection[List[T]] =
-    fromBuilder(List.newBuilder[T])
+    collectionJson[T, List[T]]
 
   implicit def vectorJson[T: JsonNodeInjection]: JsonNodeInjection[Vector[T]] =
-    fromBuilder(Vector.newBuilder[T])
+    collectionJson[T, Vector[T]]
 
   implicit def indexedSeqJson[T: JsonNodeInjection]: JsonNodeInjection[IndexedSeq[T]] =
-    fromBuilder(IndexedSeq.newBuilder[T])
+    collectionJson[T, IndexedSeq[T]]
 
   implicit def seqJson[T: JsonNodeInjection]: JsonNodeInjection[Seq[T]] =
-    fromBuilder(Seq.newBuilder[T])
+    collectionJson[T, Seq[T]]
 
   implicit def setJson[T: JsonNodeInjection]: JsonNodeInjection[Set[T]] =
-    fromBuilder(Set.newBuilder[T])
+    collectionJson[T, Set[T]]
 
   implicit def mapJson[V: JsonNodeInjection]: JsonNodeInjection[Map[String, V]] =
     new AbstractJsonNodeInjection[Map[String, V]] {