Merge pull request #539 from msgpack/remove-2-exttype-deser-apis

Remove 2 exttype deser APIs

Author: komamitsu

msgpack-jackson/README.md

@@ -222,66 +222,7 @@ When you want to use non-String value as a key of Map, use `MessagePackKeySerial
 
 `ExtensionTypeCustomDeserializers` helps you to deserialize extension types easily.
 
-#### With target Java class
-
-```java
-  NestedListComplexPojo parent = new NestedListComplexPojo();
-  parent.children = Arrays.asList(new TinyPojo("Foo"), new TinyPojo("Bar"));
-
-  // In this application, extension type 17 is used for NestedListComplexPojo
-  byte[] bytes;
-  {
-      // This ObjectMapper is just for temporary serialization
-      ObjectMapper tempObjectMapper = new ObjectMapper(new MessagePackFactory());
-      ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-      MessagePacker packer = MessagePack.newDefaultPacker(outputStream);
-
-      byte[] extBytes = tempObjectMapper.writeValueAsBytes(parent);
-      packer.packExtensionTypeHeader((byte) 17, extBytes.length);
-      packer.addPayload(extBytes);
-      packer.close();
-
-      bytes = outputStream.toByteArray();
-  }
-
-  // Register the type and the class to ExtensionTypeCustomDeserializers
-  ExtensionTypeCustomDeserializers extTypeCustomDesers = new ExtensionTypeCustomDeserializers();
-  extTypeCustomDesers.addTargetClass((byte) 17, NestedListComplexPojo.class);
-  ObjectMapper objectMapper = new ObjectMapper(
-          new MessagePackFactory().setExtTypeCustomDesers(extTypeCustomDesers));
-
-  System.out.println(objectMapper.readValue(bytes, Object.class));
-    // => NestedListComplexPojo{children=[TinyPojo{name='Foo'}, TinyPojo{name='Bar'}]}
-```
-
-#### With type reference
-
-```java
-  Map<String, Integer> map = new HashMap<>();
-  map.put("one", 1);
-  map.put("two", 2);
-
-  // In this application, extension type 31 is used for Map<String, Integer>
-  byte[] bytes;
-  {
-      // Same as above
-        :
-      packer.packExtensionTypeHeader((byte) 31, extBytes.length);
-        :
-  }
-
-  // Register the type and the type reference to ExtensionTypeCustomDeserializers
-  ExtensionTypeCustomDeserializers extTypeCustomDesers = new ExtensionTypeCustomDeserializers();
-  extTypeCustomDesers.addTargetTypeReference((byte) 31,
-  	      new TypeReference<Map<String, Integer>>() {});
-  ObjectMapper objectMapper = new ObjectMapper(
-          new MessagePackFactory().setExtTypeCustomDesers(extTypeCustomDesers));
-
-  System.out.println(objectMapper.readValue(bytes, Object.class));
-    // => {one=1, two=2}
-```
-
-#### With custom deserializer
+#### Deserialize extension type value directly
 
 ```java
   // In this application, extension type 59 is used for byte[]

msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/ExtensionTypeCustomDeserializers.java

@@ -15,21 +15,16 @@
 //
 package org.msgpack.jackson.dataformat;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class ExtensionTypeCustomDeserializers
 {
-    private final ObjectMapper objectMapper;
-    private Map<Byte, Deser> deserTable = new ConcurrentHashMap<Byte, Deser>();
+    private Map<Byte, Deser> deserTable = new ConcurrentHashMap<>();
 
     public ExtensionTypeCustomDeserializers()
     {
-        objectMapper = new ObjectMapper(new MessagePackFactory().setReuseResourceInParser(false));
     }
 
     public ExtensionTypeCustomDeserializers(ExtensionTypeCustomDeserializers src)
@@ -38,32 +33,6 @@ public ExtensionTypeCustomDeserializers(ExtensionTypeCustomDeserializers src)
         this.deserTable.putAll(src.deserTable);
     }
 
-    public <T> void addTargetClass(byte type, final Class<T> klass)
-    {
-        deserTable.put(type, new Deser()
-        {
-            @Override
-            public Object deserialize(byte[] data)
-                    throws IOException
-            {
-                return objectMapper.readValue(data, klass);
-            }
-        });
-    }
-
-    public void addTargetTypeReference(byte type, final TypeReference typeReference)
-    {
-        deserTable.put(type, new Deser()
-        {
-            @Override
-            public Object deserialize(byte[] data)
-                    throws IOException
-            {
-                return objectMapper.readValue(data, typeReference);
-            }
-        });
-    }
-
     public void addCustomDeser(byte type, final Deser deser)
     {
         deserTable.put(type, new Deser()

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

@@ -65,7 +65,19 @@ private void assertCopy(boolean advancedConfig)
         ObjectMapper objectMapper;
         if (advancedConfig) {
             ExtensionTypeCustomDeserializers extTypeCustomDesers = new ExtensionTypeCustomDeserializers();
-            extTypeCustomDesers.addTargetClass((byte) 42, TinyPojo.class);
+            extTypeCustomDesers.addCustomDeser((byte) 42,
+                    new ExtensionTypeCustomDeserializers.Deser()
+                    {
+                        @Override
+                        public Object deserialize(byte[] data)
+                                throws IOException
+                        {
+                            TinyPojo pojo = new TinyPojo();
+                            pojo.t = new String(data);
+                            return pojo;
+                        }
+                    }
+            );
 
             MessagePack.PackerConfig msgpackPackerConfig = new MessagePack.PackerConfig().withStr8FormatSupport(false);
 

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

@@ -52,7 +52,6 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -704,43 +703,19 @@ public void extensionTypeCustomDeserializers()
     {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         MessagePacker packer = MessagePack.newDefaultPacker(out);
-        packer.packArrayHeader(5);
+        packer.packArrayHeader(3);
         // 0: Integer
         packer.packInt(42);
         // 1: String
         packer.packString("foo bar");
-        // 2: ExtensionType(class desr)
-        {
-            TinyPojo t0 = new TinyPojo();
-            t0.t = "t0";
-            TinyPojo t1 = new TinyPojo();
-            t1.t = "t1";
-            NestedListComplexPojo parent = new NestedListComplexPojo();
-            parent.s = "parent";
-            parent.foos = Arrays.asList(t0, t1);
-            byte[] bytes = objectMapper.writeValueAsBytes(parent);
-            packer.packExtensionTypeHeader((byte) 17, bytes.length);
-            packer.addPayload(bytes);
-        }
-        // 3: ExtensionType(type reference deser)
-        {
-            Map<String, Integer> map = new HashMap<String, Integer>();
-            map.put("one", 1);
-            map.put("two", 2);
-            byte[] bytes = objectMapper.writeValueAsBytes(map);
-            packer.packExtensionTypeHeader((byte) 99, bytes.length);
-            packer.addPayload(bytes);
-        }
-        // 4: ExtensionType(custom deser)
+        // 2: ExtensionType
         {
             packer.packExtensionTypeHeader((byte) 31, 4);
             packer.addPayload(new byte[] {(byte) 0xCA, (byte) 0xFE, (byte) 0xBA, (byte) 0xBE});
         }
         packer.close();
 
         ExtensionTypeCustomDeserializers extTypeCustomDesers = new ExtensionTypeCustomDeserializers();
-        extTypeCustomDesers.addTargetClass((byte) 17, NestedListComplexPojo.class);
-        extTypeCustomDesers.addTargetTypeReference((byte) 99, new TypeReference<Map<String, Integer>>() {});
         extTypeCustomDesers.addCustomDeser((byte) 31, new ExtensionTypeCustomDeserializers.Deser() {
                     @Override
                     public Object deserialize(byte[] data)
@@ -757,27 +732,10 @@ public Object deserialize(byte[] data)
                 new ObjectMapper(new MessagePackFactory().setExtTypeCustomDesers(extTypeCustomDesers));
 
         List<Object> values = objectMapper.readValue(new ByteArrayInputStream(out.toByteArray()), new TypeReference<List<Object>>() {});
-        assertThat(values.size(), is(5));
+        assertThat(values.size(), is(3));
         assertThat((Integer) values.get(0), is(42));
         assertThat((String) values.get(1), is("foo bar"));
-        {
-            Object v = values.get(2);
-            assertThat(v, is(instanceOf(NestedListComplexPojo.class)));
-            NestedListComplexPojo pojo = (NestedListComplexPojo) v;
-            assertThat(pojo.s, is("parent"));
-            assertThat(pojo.foos.size(), is(2));
-            assertThat(pojo.foos.get(0).t, is("t0"));
-            assertThat(pojo.foos.get(1).t, is("t1"));
-        }
-        {
-            Object v = values.get(3);
-            assertThat(v, is(instanceOf(Map.class)));
-            Map<String, Integer> map = (Map<String, Integer>) v;
-            assertThat(map.size(), is(2));
-            assertThat(map.get("one"), is(1));
-            assertThat(map.get("two"), is(2));
-        }
-        assertThat((String) values.get(4), is("Java"));
+        assertThat((String) values.get(2), is("Java"));
     }
 
     static class TripleBytesPojo