Update jackson-module-scala and jackson-datatype-jsr310 to 3.0.0-rc2, remove usage of jackson-module-blackbird

Author: plokhotnyuk

build.sbt

@@ -253,9 +253,8 @@ lazy val `jsoniter-scala-benchmark` = crossProject(JVMPlatform, JSPlatform)
       "org.json4s" %% "json4s-ext" % "4.1.0-M8",
       "org.json4s" %% "json4s-jackson" % "4.1.0-M8",
       "org.json4s" %% "json4s-native" % "4.1.0-M8",
-      "tools.jackson.module" %% "jackson-module-scala" % "3.0.0-rc1",
-      "tools.jackson.datatype" % "jackson-datatype-jsr310" % "3.0.0-rc1",
-      "tools.jackson.module" % "jackson-module-blackbird" % "3.0.0-rc1",
+      "tools.jackson.module" %% "jackson-module-scala" % "3.0.0-rc2",
+      "tools.jackson.datatype" % "jackson-datatype-jsr310" % "3.0.0-rc2",
       "org.openjdk.jmh" % "jmh-core" % "1.37",
       "org.openjdk.jmh" % "jmh-generator-asm" % "1.37",
       "org.openjdk.jmh" % "jmh-generator-bytecode" % "1.37",

jsoniter-scala-benchmark/shared/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/JacksonSerDesers.scala

@@ -10,7 +10,6 @@ import tools.jackson.databind.json.JsonMapper
 import tools.jackson.datatype.jsr310.JavaTimeModule
 import tools.jackson.databind.module.SimpleModule
 import tools.jackson.databind.ser.std.StdSerializer
-import tools.jackson.module.blackbird.BlackbirdModule
 import tools.jackson.module.scala.deser.{ImmutableBitSetDeserializer, MutableBitSetDeserializer}
 import tools.jackson.module.scala.{BitSetDeserializerModule, ClassTagExtensions, DefaultScalaModule}
 import com.github.plokhotnyuk.jsoniter_scala.benchmark.SuitEnum.SuitEnum
@@ -63,7 +62,6 @@ object JacksonSerDesers {
         .addDeserializer(classOf[SuitADT], new SuitADTDeserializer)
         .addDeserializer(classOf[SuitEnum], new SuiteEnumDeserializer)
       )
-      .addModule(new BlackbirdModule)
       .configure(SerializationFeature.INDENT_OUTPUT, indentOutput)
       .configure(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE, false)
       .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)

jsoniter-scala-benchmark/shared/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/benchmark/Json4sFormats.scala

@@ -5,6 +5,11 @@ import org.json4s.ext.{EnumNameSerializer, UUIDSerializer}
 import java.time._
 import java.util.Base64
 import scala.reflect.ClassTag
+import com.fasterxml.jackson.core._
+import com.fasterxml.jackson.core.util._
+import com.fasterxml.jackson.core.json.JsonWriteFeature
+import com.fasterxml.jackson.databind._
+import org.json4s.jackson.Json4sScalaModule
 
 object CommonJson4sFormats {
   implicit val commonFormats: Formats = DefaultFormats +
@@ -47,9 +52,9 @@ object JavaTimeJson4sFormats {
 object GeoJsonJson4sFormats {
   implicit val geoJsonFormats: Formats = new DefaultFormats {
     override val typeHints: TypeHints = new SimpleTypeHints(List(
-        classOf[GeoJSON.Point], classOf[GeoJSON.MultiPoint], classOf[GeoJSON.LineString],
-        classOf[GeoJSON.MultiLineString], classOf[GeoJSON.Polygon], classOf[GeoJSON.MultiPolygon],
-        classOf[GeoJSON.GeometryCollection], classOf[GeoJSON.Feature], classOf[GeoJSON.FeatureCollection]))
+      classOf[GeoJSON.Point], classOf[GeoJSON.MultiPoint], classOf[GeoJSON.LineString],
+      classOf[GeoJSON.MultiLineString], classOf[GeoJSON.Polygon], classOf[GeoJSON.MultiPolygon],
+      classOf[GeoJSON.GeometryCollection], classOf[GeoJSON.Feature], classOf[GeoJSON.FeatureCollection]))
   } +
     new CustomSerializer[(Double, Double)](_ => ({
       case JArray(JDouble(x) :: JDouble(y) :: Nil) => new Tuple2[Double, Double](x, y)
@@ -92,12 +97,6 @@ class SimpleTypeHints(override val hints: List[Class[_]],
 }
 
 object Json4sJacksonMappers {
-  import com.fasterxml.jackson.core._
-  import com.fasterxml.jackson.core.util._
-  import com.fasterxml.jackson.core.json.JsonWriteFeature
-  import com.fasterxml.jackson.databind._
-  import org.json4s.jackson.Json4sScalaModule
-
   private[this] def mapper(indentOutput: Boolean = false, escapeNonAscii: Boolean = false,
                            useBigNumber: Boolean = false): ObjectMapper = {
     val jsonFactory = new JsonFactoryBuilder()
@@ -119,8 +118,8 @@ object Json4sJacksonMappers {
   }
 
   val mapper: ObjectMapper = mapper()
+  val jValueType: JavaType = mapper.constructType(classOf[JValue])
   val bigNumberMapper: ObjectMapper = mapper(useBigNumber = true)
   val prettyPrintMapper: ObjectMapper = mapper(indentOutput = true)
   val escapeNonAsciiMapper: ObjectMapper = mapper(escapeNonAscii = true)
-  val jValueType: JavaType = mapper.constructType(classOf[JValue])
 }