From 5e6be68aa0b324911859fc7668ddccddef2ae309 Mon Sep 17 00:00:00 2001
From: ghik <romeqjanoosh@gmail.com>
Date: Thu, 29 Mar 2018 13:57:14 +0200
Subject: [PATCH] removed fallback map codecs that use key-value pair list
 encoding

---
 .../commons/serialization/GenCodec.scala      | 44 +------------------
 .../commons/serialization/GenCodecTest.scala  |  5 ---
 .../commons/mongo/BsonGenCodecs.scala         |  5 ++-
 3 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/commons-core/src/main/scala/com/avsystem/commons/serialization/GenCodec.scala b/commons-core/src/main/scala/com/avsystem/commons/serialization/GenCodec.scala
index 266ecf57d..1f697f932 100644
--- a/commons-core/src/main/scala/com/avsystem/commons/serialization/GenCodec.scala
+++ b/commons-core/src/main/scala/com/avsystem/commons/serialization/GenCodec.scala
@@ -31,7 +31,7 @@ trait GenCodec[T] {
   def write(output: Output, value: T): Unit
 }
 
-object GenCodec extends FallbackMapCodecs with TupleGenCodecs {
+object GenCodec extends RecursiveAutoCodecs with TupleGenCodecs {
   /**
     * Macro that automatically materializes a [[GenCodec]] for some type `T`, which must be one of:
     * <ul>
@@ -405,48 +405,6 @@ object GenCodec extends FallbackMapCodecs with TupleGenCodecs {
   implicit lazy val NothingAutoCodec: GenCodec.Auto[Nothing] = GenCodec.Auto[Nothing](NothingCodec)
 }
 
-/**
-  * Contains readers for maps where there is no DBKeyCodec for key type. In such case, we assume reading from a list
-  * of key-value pairs instead of JSON object.
-  */
-trait FallbackMapCodecs extends RecursiveAutoCodecs { this: GenCodec.type =>
-  private def readKVPair[K: GenCodec, V: GenCodec](input: ObjectInput): (K, V) = {
-    val key = read[K](input.nextField().assertField("k"))
-    val value = read[V](input.nextField().assertField("v"))
-    (key, value)
-  }
-
-  private def writeKVPair[K, V](output: ObjectOutput, key: K, value: V)(implicit keyCodec: GenCodec[K], valueCodec: GenCodec[V]): Unit = {
-    keyCodec.write(output.writeField("k"), key)
-    valueCodec.write(output.writeField("v"), value)
-    output.finish()
-  }
-
-  private def collectPairsTo[K: GenCodec, V: GenCodec, C](li: ListInput)(implicit cbf: CanBuildFrom[Nothing, (K, V), C]): C = {
-    val b = cbf()
-    while (li.hasNext) {
-      b += readKVPair[K, V](li.nextElement().readObject())
-    }
-    b.result()
-  }
-
-  implicit def fallbackMapCodec[M[X, Y] <: BMap[X, Y], K: GenCodec, V: GenCodec](
-    implicit cbf: CanBuildFrom[Nothing, (K, V), M[K, V]]): GenCodec[M[K, V] with BMap[K, V]] =
-    createList[M[K, V] with BMap[K, V]](
-      collectPairsTo[K, V, M[K, V]],
-      (lo, map) => map.iterator.foreach({ case (k, v) => writeKVPair(lo.writeElement().writeObject(), k, v) }),
-      allowNull = true
-    )
-
-  implicit def fallbackJMapCodec[M[X, Y] <: JMap[X, Y], K: GenCodec, V: GenCodec](
-    implicit cbf: JCanBuildFrom[(K, V), M[K, V]]): GenCodec[M[K, V] with JMap[K, V]] =
-    createList[M[K, V] with JMap[K, V]](
-      collectPairsTo[K, V, M[K, V]],
-      (lo, map) => map.asScala.iterator.foreach({ case (k, v) => writeKVPair(lo.writeElement().writeObject(), k, v) }),
-      allowNull = true
-    )
-}
-
 trait RecursiveAutoCodecs { this: GenCodec.type =>
   /**
     * Like `materialize`, but descends into types that `T` is made of (e.g. case class field types).
diff --git a/commons-core/src/test/scala/com/avsystem/commons/serialization/GenCodecTest.scala b/commons-core/src/test/scala/com/avsystem/commons/serialization/GenCodecTest.scala
index 977293f7c..2bd5b6de1 100644
--- a/commons-core/src/test/scala/com/avsystem/commons/serialization/GenCodecTest.scala
+++ b/commons-core/src/test/scala/com/avsystem/commons/serialization/GenCodecTest.scala
@@ -74,9 +74,6 @@ class GenCodecTest extends CodecTestBase {
     testWriteReadAndAutoWriteRead[JHashMap[String, Int]](jHashMap, ListMap("1" -> 1, "2" -> 2, "3" -> 3))
     testWriteReadAndAutoWriteRead[JLinkedHashMap[String, Int]](jLinkedHashMap, ListMap("1" -> 1, "2" -> 2, "3" -> 3))
     testWriteReadAndAutoWriteRead[JHashMap[Int, Int]](jIntHashMap, ListMap("1" -> 1, "2" -> 2, "3" -> 3))
-    testSameElementsWriteRead[JHashMap[Double, Int]](jDoubleHashMap,
-      List(Map[String, Any]("k" -> 1.0, "v" -> 1), Map[String, Any]("k" -> 2.0, "v" -> 2), Map[String, Any]("k" -> 3.0, "v" -> 3))
-    )
   }
 
   test("NoState test") {
@@ -92,8 +89,6 @@ class GenCodecTest extends CodecTestBase {
     testWriteReadAndAutoWriteRead[Set[Int]](set, set.toList)
     testWriteReadAndAutoWriteRead[Map[String, Int]](map, map)
     testWriteReadAndAutoWriteRead[Map[Int, Int]](intMap, ListMap("1" -> 1, "2" -> 2, "3" -> 3))
-    testWriteReadAndAutoWriteRead[Map[Double, Int]](doubleMap,
-      List(Map[String, Any]("k" -> 1.0, "v" -> 1), Map[String, Any]("k" -> 2.0, "v" -> 2), Map[String, Any]("k" -> 3.0, "v" -> 3)))
     testWriteReadAndAutoWriteRead[IHashMap[String, Int]](hashMap, hashMap)
   }
 
diff --git a/commons-mongo/src/main/scala/com/avsystem/commons/mongo/BsonGenCodecs.scala b/commons-mongo/src/main/scala/com/avsystem/commons/mongo/BsonGenCodecs.scala
index 49f7c94f7..ba49d9296 100644
--- a/commons-mongo/src/main/scala/com/avsystem/commons/mongo/BsonGenCodecs.scala
+++ b/commons-mongo/src/main/scala/com/avsystem/commons/mongo/BsonGenCodecs.scala
@@ -1,11 +1,12 @@
 package com.avsystem.commons
 package mongo
 
-import com.avsystem.commons.serialization.GenCodec
+import com.avsystem.commons.serialization.{GenCodec, GenKeyCodec}
 import org.bson.types.ObjectId
 
 trait BsonGenCodecs {
   implicit def objectIdCodec: GenCodec[ObjectId] = BsonGenCodecs.objectIdCodec
+  implicit def objectIdKeyCodec: GenKeyCodec[ObjectId] = BsonGenCodecs.objectIdKeyCodec
 }
 
 object BsonGenCodecs {
@@ -19,4 +20,6 @@ object BsonGenCodecs {
       case (otherOutput, objectId) => otherOutput.writeString(objectId.toHexString)
     }
   )
+  implicit val objectIdKeyCodec: GenKeyCodec[ObjectId] =
+    GenKeyCodec.create(new ObjectId(_), _.toHexString)
 }