Skip to content

Support ext type key in Map #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
komamitsu merged 8 commits into from
Dec 16, 2020
Merged

Support ext type key in Map #535

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
136f32b
Support ext type as map-key
komamitsu Dec 12, 2020
8bb0660
Remove verbose code
komamitsu Dec 12, 2020
4b2e4a1
Add MessagePackParserTest#extensionTypeWithPojoInMap
komamitsu Dec 13, 2020
651e220
Add comments
komamitsu Dec 15, 2020
344ebd1
Describe how to use ext type in Map
komamitsu Dec 15, 2020
4411cac
Small improvement
komamitsu Dec 16, 2020
86b729d
Refactoring
komamitsu Dec 16, 2020
edd0942
Keep compatible behavior
komamitsu Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Support ext type as map-key
  • Loading branch information
@komamitsu
komamitsu committed Dec 13, 2020
commit 136f32b85728c2d8057ee743dcaa71de93640224
28 changes: 20 additions & 8 deletions msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,13 @@ public JsonToken nextToken()
type = Type.EXT;
ExtensionTypeHeader header = messageUnpacker.unpackExtensionTypeHeader();
extensionTypeValue = new MessagePackExtensionType(header.getType(), messageUnpacker.readPayload(header.getLength()));
nextToken = JsonToken.VALUE_EMBEDDED_OBJECT;
if (parsingContext.inObject() && _currToken != JsonToken.FIELD_NAME) {
parsingContext.setCurrentName(getExtensionTypeValue().toString());
nextToken = JsonToken.FIELD_NAME;
}
else {
nextToken = JsonToken.VALUE_EMBEDDED_OBJECT;
}
break;
default:
throw new IllegalStateException("Shouldn't reach here");
Expand Down Expand Up @@ -563,6 +569,18 @@ public BigDecimal getDecimalValue()
}
}

private Object getExtensionTypeValue()
throws IOException
{
if (extTypeCustomDesers != null) {
ExtensionTypeCustomDeserializers.Deser deser = extTypeCustomDesers.getDeser(extensionTypeValue.getType());
if (deser != null) {
return deser.deserialize(extensionTypeValue.getData());
}
}
return extensionTypeValue;
}

@Override
public Object getEmbeddedObject()
throws IOException, JsonParseException
Expand All @@ -571,13 +589,7 @@ public Object getEmbeddedObject()
case BYTES:
return bytesValue;
case EXT:
if (extTypeCustomDesers != null) {
ExtensionTypeCustomDeserializers.Deser deser = extTypeCustomDesers.getDeser(extensionTypeValue.getType());
if (deser != null) {
return deser.deserialize(extensionTypeValue.getData());
}
}
return extensionTypeValue;
return getExtensionTypeValue();
default:
throw new IllegalStateException("Invalid type=" + type);
}
Expand Down
107 changes: 107 additions & 0 deletions msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,27 @@
//
package org.msgpack.jackson.dataformat;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.io.JsonEOFException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.KeyDeserializer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import org.junit.Test;
import org.msgpack.core.MessagePack;
import org.msgpack.core.MessagePacker;
import org.msgpack.value.ExtensionValue;
import org.msgpack.value.MapValue;
import org.msgpack.value.ValueFactory;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand All @@ -44,6 +51,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
Expand Down Expand Up @@ -775,6 +783,105 @@ public Object deserialize(byte[] data)
assertThat((String) values.get(4), is("Java"));
}


static class UUIDSerializer
extends StdSerializer<UUID>
{
private final byte code;

UUIDSerializer(byte code)
{
super(UUID.class);
this.code = code;
}

public void serialize(UUID value, JsonGenerator jsonGenerator, SerializerProvider provider)
throws IOException
{
if (jsonGenerator instanceof MessagePackGenerator) {
MessagePackGenerator messagePackGenerator = (MessagePackGenerator) jsonGenerator;
messagePackGenerator.writeExtensionType(new MessagePackExtensionType(code, toBytes(value)));
} else {
throw new RuntimeException("Something went wrong with the serialization");
}
}

@SuppressWarnings("WeakerAccess")
static byte[] toBytes(UUID value)
{
return value.toString().getBytes();
}

static UUID fromBytes(byte[] value)
{
return UUID.fromString(new String(value));
}
}

@Test
public void extensionTypeInMap()
throws IOException
{
byte uuidTypeCode = 42;

ExtensionTypeCustomDeserializers extTypeCustomDesers = new ExtensionTypeCustomDeserializers();
extTypeCustomDesers.addCustomDeser(uuidTypeCode, new ExtensionTypeCustomDeserializers.Deser()
{
@Override
public Object deserialize(byte[] value1)
throws IOException
{
return UUIDSerializer.fromBytes(value1);
}
});

ObjectMapper objectMapper = new ObjectMapper(
new MessagePackFactory().setExtTypeCustomDesers(extTypeCustomDesers));

SimpleModule simpleModule = new SimpleModule();
simpleModule.addDeserializer(UUID.class,
new JsonDeserializer<UUID>()
{
@Override
public UUID deserialize(JsonParser p, DeserializationContext ctxt)
throws IOException, JsonProcessingException
{
return UUID.fromString(p.readValueAs(String.class));
}
});
objectMapper.registerModule(simpleModule);

// Prepare serialized data
Map<UUID, UUID> originalMap = new HashMap<>();
byte[] serializedData;
{
ValueFactory.MapBuilder mapBuilder = ValueFactory.newMapBuilder();
for (int i = 0; i < 4; i++) {
UUID uuidKey = UUID.randomUUID();
UUID uuidValue = UUID.randomUUID();
ExtensionValue k = ValueFactory.newExtension(uuidTypeCode, uuidKey.toString().getBytes());
ExtensionValue v = ValueFactory.newExtension(uuidTypeCode, uuidValue.toString().getBytes());
mapBuilder.put(k, v);
originalMap.put(uuidKey, uuidValue);
}
ByteArrayOutputStream output = new ByteArrayOutputStream();
MessagePacker packer = MessagePack.newDefaultPacker(output);
MapValue mapValue = mapBuilder.build();
mapValue.writeTo(packer);
packer.close();

serializedData = output.toByteArray();
}

Map<UUID, UUID> deserializedMap = objectMapper.readValue(serializedData,
new TypeReference<Map<UUID, UUID>>() {});

assertEquals(originalMap.size(), deserializedMap.size());
for (Map.Entry<UUID, UUID> entry : originalMap.entrySet()) {
assertEquals(entry.getValue(), deserializedMap.get(entry.getKey()));
}
}

@Test
public void parserShouldReadStrAsBin()
throws IOException
Expand Down