Skip to content

Commit 84cbc79

Browse files
committed
Implement jackson field ids
1 parent 3c08b90 commit 84cbc79

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -513,12 +513,11 @@ private void writeByteArrayTextKey(byte[] text, int offset, int len) throws IOEx
513513
addValueNode(new String(text, offset, len, DEFAULT_CHARSET));
514514
}
515515

516-
// TODO: Uncomment
517-
//@Override
518-
//public void writeFieldId(long id) throws IOException
519-
//{
520-
// addKeyToStackTop(id);
521-
//}
516+
@Override
517+
public void writeFieldId(long id) throws IOException
518+
{
519+
addKeyNode(id);
520+
}
522521

523522
@Override
524523
public void writeFieldName(String name)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -621,10 +621,10 @@ public String currentName()
621621
return streamReadContext.getCurrentName();
622622
}
623623

624-
// TODO: Uncomment
625-
//public boolean isCurrentFieldId() {
626-
// return this.type == Type.INT || this.type == Type.LONG;
627-
//}
624+
public boolean isCurrentFieldId()
625+
{
626+
return this.type == Type.INT || this.type == Type.LONG;
627+
}
628628

629629
@Override
630630
public String getCurrentName()

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,9 @@ public Object deserializeKey(String s, DeserializationContext deserializationCon
5050
JsonParser parser = deserializationContext.getParser();
5151
if (parser instanceof MessagePackParser) {
5252
MessagePackParser p = (MessagePackParser) parser;
53-
// TODO: Uncomment
54-
//if (p.isCurrentFieldId()) {
55-
// return Integer.valueOf(s);
56-
//}
53+
if (p.isCurrentFieldId()) {
54+
return Integer.valueOf(s);
55+
}
5756
}
5857
return s;
5958
}

0 commit comments

Comments
 (0)