Use msgpack-core's serde for timestamp internally

komamitsu · Sep 14, 2022 · Sep 13, 2022 · Sep 13, 2022 · Sep 13, 2022 · Sep 13, 2022
commit 0010e05621215e77ce8a70bfaba1c88d09f3c687
diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/TimestampExtensionModule.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/TimestampExtensionModule.java
@@ -10,8 +10,11 @@
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import org.msgpack.core.ExtensionTypeHeader;
 import org.msgpack.core.MessagePack;
+import org.msgpack.core.MessagePacker;
 import org.msgpack.core.MessageUnpacker;
+import org.msgpack.value.TimestampValue;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.time.Instant;
 
@@ -39,6 +42,20 @@ protected InstantSerializer(Class<Instant> t)
         public void serialize(Instant value, JsonGenerator gen, SerializerProvider provider)
             throws IOException
         {
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+            // MEMO: Reusing these MessagePacker and MessageUnpacker instances would improve the performance
+            try (MessagePacker packer = MessagePack.newDefaultPacker(os)) {
+                packer.packTimestamp(value);
+            }
+            try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(os.toByteArray())) {
+                ExtensionTypeHeader header = unpacker.unpackExtensionTypeHeader();
+                byte[] bytes = unpacker.readPayload(header.getLength());
+
+                MessagePackExtensionType extensionType = new MessagePackExtensionType(EXT_TYPE, bytes);
+                gen.writeObject(extensionType);
+            }
+
+            /*
             int nanos = value.getNano();
             long epochSeconds = value.getEpochSecond();
 
@@ -55,6 +72,8 @@ public void serialize(Instant value, JsonGenerator gen, SerializerProvider provi
             MessagePackExtensionType extensionType = new MessagePackExtensionType(EXT_TYPE, bytes);
 
             gen.writeObject(extensionType);
+
+             */
         }
     }
 

diff --git a/...ck-jackson/src/test/java/org/msgpack/jackson/dataformat/TimestampExtensionModuleTest.java b/...ck-jackson/src/test/java/org/msgpack/jackson/dataformat/TimestampExtensionModuleTest.java
@@ -19,6 +19,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.msgpack.core.MessagePack;
+import org.msgpack.core.MessagePacker;
+import org.msgpack.core.MessageUnpacker;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -77,20 +79,51 @@ public void testTripleInstantsPojo()
         assertEquals(now.plusSeconds(1), deserialized.c);
     }
 
+    @Test
+    public void deserialize32BitFormat()
+            throws IOException
+    {
+        Instant instant = Instant.ofEpochSecond(Instant.now().getEpochSecond());
+
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        try (MessagePacker packer = MessagePack.newDefaultPacker(os)) {
+            packer.packMapHeader(1)
+                    .packString("instant")
+                    .packTimestamp(instant);
+        }
+
+        byte[] bytes = os.toByteArray();
+        try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bytes)) {
+            unpacker.unpackMapHeader();
+            unpacker.unpackString();
+            assertEquals(4, unpacker.unpackExtensionTypeHeader().getLength());
+        }
+
+        SingleInstant deserialized = objectMapper.readValue(bytes, SingleInstant.class);
+        assertEquals(instant, deserialized.instant);
+    }
+
     @Test
     public void deserialize64BitFormat()
             throws IOException
     {
-        Instant now = Instant.now();
+        Instant instant = Instant.ofEpochSecond(Instant.now().getEpochSecond(), 1234);
 
         ByteArrayOutputStream os = new ByteArrayOutputStream();
-        MessagePack.newDefaultPacker(os)
-                .packMapHeader(1)
-                .packString("instant")
-                .packTimestamp(now)
-                .close();
-
-        SingleInstant deserialized = objectMapper.readValue(os.toByteArray(), SingleInstant.class);
-        assertEquals(now, deserialized.instant);
+        try (MessagePacker packer = MessagePack.newDefaultPacker(os)) {
+            packer.packMapHeader(1)
+                    .packString("instant")
+                    .packTimestamp(instant);
+        }
+
+        byte[] bytes = os.toByteArray();
+        try (MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(bytes)) {
+            unpacker.unpackMapHeader();
+            unpacker.unpackString();
+            assertEquals(8, unpacker.unpackExtensionTypeHeader().getLength());
+        }
+
+        SingleInstant deserialized = objectMapper.readValue(bytes, SingleInstant.class);
+        assertEquals(instant, deserialized.instant);
     }
 }