Implement jackson field ids

msgpack · Jan 20, 2025 · 84cbc79 · 84cbc79
1 parent 3c08b90
commit 84cbc79
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java
@@ -513,12 +513,11 @@ private void writeByteArrayTextKey(byte[] text, int offset, int len) throws IOEx
         addValueNode(new String(text, offset, len, DEFAULT_CHARSET));
     }
 
-    // TODO: Uncomment
-    //@Override
-    //public void writeFieldId(long id) throws IOException
-    //{
-    //    addKeyToStackTop(id);
-    //}
+    @Override
+    public void writeFieldId(long id) throws IOException
+    {
+        addKeyNode(id);
+    }
 
     @Override
     public void writeFieldName(String name)

diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java
@@ -621,10 +621,10 @@ public String currentName()
         return streamReadContext.getCurrentName();
     }
 
-    // TODO: Uncomment
-    //public boolean isCurrentFieldId() {
-    //    return this.type == Type.INT || this.type == Type.LONG;
-    //}
+    public boolean isCurrentFieldId()
+    {
+        return this.type == Type.INT || this.type == Type.LONG;
+    }
 
     @Override
     public String getCurrentName()

diff --git a/...son/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatForFieldIdTest.java b/...son/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatForFieldIdTest.java
@@ -50,10 +50,9 @@ public Object deserializeKey(String s, DeserializationContext deserializationCon
                 JsonParser parser = deserializationContext.getParser();
                 if (parser instanceof MessagePackParser) {
                     MessagePackParser p = (MessagePackParser) parser;
-                    // TODO: Uncomment
-                    //if (p.isCurrentFieldId()) {
-                    //    return Integer.valueOf(s);
-                    //}
+                    if (p.isCurrentFieldId()) {
+                        return Integer.valueOf(s);
+                    }
                 }
                 return s;
             }