Merge pull request #650 from msgpack/jackson-databind-2_13

Jackson databind 2 13

Author: komamitsu

build.sbt

@@ -102,7 +102,7 @@ lazy val msgpackJackson =
         "org.msgpack.jackson.dataformat"
       ),
       libraryDependencies ++= Seq(
-        "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1",
+        "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.3",
         junitInterface,
         "org.apache.commons" % "commons-math3" % "3.6.1" % "test"
       ),

msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackGeneratorTest.java

@@ -663,7 +663,9 @@ public void testNonStringKey()
 
             ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
             if (mapHolder instanceof NonStringKeyMapHolderWithoutAnnotation) {
-                objectMapper.setSerializerFactory(new MessagePackSerializerFactory());
+                SimpleModule mod = new SimpleModule("test");
+                mod.addKeySerializer(Object.class, new MessagePackKeySerializer());
+                objectMapper.registerModule(mod);
             }
 
             byte[] bytes = objectMapper.writeValueAsBytes(mapHolder);
@@ -709,7 +711,9 @@ public void testComplexTypeKey()
         map.put(pojo, 42);
 
         ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
-        objectMapper.setSerializerFactory(new MessagePackSerializerFactory());
+        SimpleModule mod = new SimpleModule("test");
+        mod.addKeySerializer(TinyPojo.class, new MessagePackKeySerializer());
+        objectMapper.registerModule(mod);
         byte[] bytes = objectMapper.writeValueAsBytes(map);
 
         MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bytes);
@@ -731,7 +735,9 @@ public void testComplexTypeKeyWithV06Format()
 
         ObjectMapper objectMapper = new ObjectMapper(new MessagePackFactory());
         objectMapper.setAnnotationIntrospector(new JsonArrayFormat());
-        objectMapper.setSerializerFactory(new MessagePackSerializerFactory());
+        SimpleModule mod = new SimpleModule("test");
+        mod.addKeySerializer(TinyPojo.class, new MessagePackKeySerializer());
+        objectMapper.registerModule(mod);
         byte[] bytes = objectMapper.writeValueAsBytes(map);
 
         MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bytes);