Add smile data format (via jackson)

dkomanov/scala-serialization#8
dkomanov · Aug 3, 2019 · 13485b8 · 13485b8
1 parent 319b212
commit 13485b8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -97,10 +97,11 @@ maven_install(
     artifacts = [
         "org.slf4j:slf4j-api:1.7.25",
         "org.slf4j:slf4j-nop:1.7.25",
-        "com.fasterxml.jackson.core:jackson-databind:2.9.5",
-        "com.fasterxml.jackson.core:jackson-core:2.9.5",
-        "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.5",
-        "com.fasterxml.jackson.module:jackson-module-scala_%s:2.9.5" % scala_version,
+        "com.fasterxml.jackson.core:jackson-databind:2.9.9",
+        "com.fasterxml.jackson.core:jackson-core:2.9.9",
+        "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.9",
+        "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.9",
+        "com.fasterxml.jackson.module:jackson-module-scala_%s:2.9.9" % scala_version,
         "io.suzaku:boopickle_%s:1.3.0" % scala_version,
         "com.twitter:chill_%s:0.9.2" % scala_version,
         "org.apache.thrift:libthrift:0.10.0",

diff --git a/src/com/komanov/serialization/converters/BUILD b/src/com/komanov/serialization/converters/BUILD
@@ -113,6 +113,7 @@ scala_library(
         "@scala_serialization_maven//:com_fasterxml_jackson_core_jackson_core",
         "@scala_serialization_maven//:com_fasterxml_jackson_core_jackson_databind",
         "@scala_serialization_maven//:com_fasterxml_jackson_dataformat_jackson_dataformat_cbor",
+        "@scala_serialization_maven//:com_fasterxml_jackson_dataformat_jackson_dataformat_smile",
         "@scala_serialization_maven//:com_fasterxml_jackson_module_jackson_module_scala_2_12",
     ],
 )

diff --git a/src/com/komanov/serialization/converters/Converters.scala b/src/com/komanov/serialization/converters/Converters.scala
@@ -7,6 +7,7 @@ object Converters {
   val all: Seq[(String, MyConverter)] = Seq(
     "JSON" -> JsonConverter,
     "CBOR" -> JacksonCborConverter,
+    "Smile" -> JacksonSmileConverter,
     "ScalaPB" -> ScalaPbConverter,
     "Java PB" -> JavaPbConverter,
     "Java Thrift" -> JavaThriftConverter,

diff --git a/src/com/komanov/serialization/converters/JsonConverter.scala b/src/com/komanov/serialization/converters/JsonConverter.scala
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.Module.SetupContext
 import com.fasterxml.jackson.databind._
 import com.fasterxml.jackson.databind.module.{SimpleDeserializers, SimpleSerializers}
 import com.fasterxml.jackson.dataformat.cbor.{CBORFactory, CBORGenerator}
+import com.fasterxml.jackson.dataformat.smile.SmileFactory
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import com.komanov.serialization.converters.api.MyConverter
 import com.komanov.serialization.domain.{Site, SiteEvent}
@@ -16,6 +17,8 @@ object JsonConverter extends JacksonConverterBase(new JsonFactory())
 
 object JacksonCborConverter extends JacksonConverterBase(new CBORFactory().disable(CBORGenerator.Feature.WRITE_MINIMAL_INTS))
 
+object JacksonSmileConverter extends JacksonConverterBase(new SmileFactory())
+
 abstract class JacksonConverterBase(jsonFactory: JsonFactory) extends MyConverter {
 
   private object InstantModule extends Module {

diff --git a/src/com/komanov/serialization/jmh/ConverterType.java b/src/com/komanov/serialization/jmh/ConverterType.java
@@ -6,6 +6,7 @@
 public enum ConverterType {
     JSON(JsonConverter$.MODULE$),
     CBOR(JacksonCborConverter$.MODULE$),
+    SMILE(JacksonSmileConverter$.MODULE$),
     SCALA_PB(ScalaPbConverter$.MODULE$),
     JAVA_PB(JavaPbConverter$.MODULE$),
     JAVA_THRIFT(JavaThriftConverter$.MODULE$),