FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix NPE at ObjectMapper#copy with MessagePackFactory by komamitsu · Pull Request #471 · msgpack/msgpack-java · GitHub

/ msgpack-java Public

Fix NPE at ObjectMapper#copy with MessagePackFactory #471

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 3 commits into from
Apr 14, 2018
Conversation 0 Commits 3 Checks 0 Files changed
Merged

Fix NPE at ObjectMapper#copy with MessagePackFactory #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
906a5fd
Fix NPE at ObjectMapper#copy with MessagePackFactory
komamitsu Apr 14, 2018
5505124
Refactor the test
komamitsu Apr 14, 2018
2b6487f
Remove unused import
komamitsu Apr 14, 2018
File filter

Filter by extension

Filter by extension .java  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
4 changes: 3 additions & 1 deletion msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackFactory.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ public MessagePackFactory(MessagePackFactory src)
this.packerConfig = src.packerConfig.clone();
this.reuseResourceInGenerator = src.reuseResourceInGenerator;
this.reuseResourceInParser = src.reuseResourceInParser;
this.extTypeCustomDesers = new ExtensionTypeCustomDeserializers(src.extTypeCustomDesers);
if (src.extTypeCustomDesers != null) {
this.extTypeCustomDesers = new ExtensionTypeCustomDeserializers(src.extTypeCustomDesers);
}
}

public MessagePackFactory setReuseResourceInGenerator(boolean reuseResourceInGenerator)
Expand Down
87 changes: 67 additions & 20 deletions msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackFactoryTest.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
import org.junit.Test;
import org.msgpack.core.MessagePack;

Expand Down Expand Up @@ -57,47 +58,93 @@ public void testCreateParser()
assertEquals(MessagePackParser.class, parser.getClass());
}

@Test
public void copy()
private void assertCopy(boolean advancedConfig)
throws IOException
{
ExtensionTypeCustomDeserializers extTypeCustomDesers = new ExtensionTypeCustomDeserializers();
extTypeCustomDesers.addTargetClass((byte) 42, TinyPojo.class);
// Build base ObjectMapper
ObjectMapper objectMapper;
if (advancedConfig) {
ExtensionTypeCustomDeserializers extTypeCustomDesers = new ExtensionTypeCustomDeserializers();
extTypeCustomDesers.addTargetClass((byte) 42, TinyPojo.class);

MessagePack.PackerConfig msgpackPackerConfig = new MessagePack.PackerConfig().withStr8FormatSupport(false);

MessagePack.PackerConfig msgpackPackerConfig = new MessagePack.PackerConfig().withStr8FormatSupport(false);
MessagePackFactory messagePackFactory = new MessagePackFactory(msgpackPackerConfig);
messagePackFactory.setExtTypeCustomDesers(extTypeCustomDesers);

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

ObjectMapper objectMapper = new ObjectMapper(messagePackFactory);
objectMapper.configure(JsonGenerator.Feature.AUTO_CLOSE_TARGET, false);
objectMapper.configure(JsonParser.Feature.AUTO_CLOSE_SOURCE, false);

objectMapper.configure(JsonGenerator.Feature.AUTO_CLOSE_TARGET, false);
objectMapper.configure(JsonParser.Feature.AUTO_CLOSE_SOURCE, false);
objectMapper.setAnnotationIntrospector(new JsonArrayFormat());
}
else {
MessagePackFactory messagePackFactory = new MessagePackFactory();
objectMapper = new ObjectMapper(messagePackFactory);
}

objectMapper.setAnnotationIntrospector(new JsonArrayFormat());
// Use the original ObjectMapper in advance
{
byte[] bytes = objectMapper.writeValueAsBytes(1234);
assertThat(objectMapper.readValue(bytes, Integer.class), is(1234));
}

// Copy the ObjectMapper
ObjectMapper copiedObjectMapper = objectMapper.copy();

// Assert the copied ObjectMapper
JsonFactory copiedFactory = copiedObjectMapper.getFactory();
assertThat(copiedFactory, is(instanceOf(MessagePackFactory.class)));
MessagePackFactory copiedMessagePackFactory = (MessagePackFactory) copiedFactory;

assertThat(copiedMessagePackFactory.getPackerConfig().isStr8FormatSupport(), is(false));
Collection<AnnotationIntrospector> annotationIntrospectors =
copiedObjectMapper.getSerializationConfig().getAnnotationIntrospector().allIntrospectors();
assertThat(annotationIntrospectors.size(), is(1));

assertThat(copiedMessagePackFactory.getExtTypeCustomDesers().getDeser((byte) 42), is(notNullValue()));
assertThat(copiedMessagePackFactory.getExtTypeCustomDesers().getDeser((byte) 43), is(nullValue()));
if (advancedConfig) {
assertThat(copiedMessagePackFactory.getPackerConfig().isStr8FormatSupport(), is(false));

assertThat(copiedMessagePackFactory.isEnabled(JsonGenerator.Feature.AUTO_CLOSE_TARGET), is(false));
assertThat(copiedMessagePackFactory.isEnabled(JsonParser.Feature.AUTO_CLOSE_SOURCE), is(false));
assertThat(copiedMessagePackFactory.getExtTypeCustomDesers().getDeser((byte) 42), is(notNullValue()));
assertThat(copiedMessagePackFactory.getExtTypeCustomDesers().getDeser((byte) 43), is(nullValue()));

Collection<AnnotationIntrospector> annotationIntrospectors = copiedObjectMapper.getSerializationConfig().getAnnotationIntrospector().allIntrospectors();
assertThat(annotationIntrospectors.size(), is(1));
assertThat(annotationIntrospectors.stream().findFirst().get(), is(instanceOf(JsonArrayFormat.class)));
assertThat(copiedMessagePackFactory.isEnabled(JsonGenerator.Feature.AUTO_CLOSE_TARGET), is(false));
assertThat(copiedMessagePackFactory.isEnabled(JsonParser.Feature.AUTO_CLOSE_SOURCE), is(false));

HashMap<String, Integer> map = new HashMap<>();
assertThat(annotationIntrospectors.stream().findFirst().get(), is(instanceOf(JsonArrayFormat.class)));
}
else {
assertThat(copiedMessagePackFactory.getPackerConfig().isStr8FormatSupport(), is(true));

assertThat(copiedMessagePackFactory.getExtTypeCustomDesers(), is(nullValue()));

assertThat(copiedMessagePackFactory.isEnabled(JsonGenerator.Feature.AUTO_CLOSE_TARGET), is(true));
assertThat(copiedMessagePackFactory.isEnabled(JsonParser.Feature.AUTO_CLOSE_SOURCE), is(true));

assertThat(annotationIntrospectors.stream().findFirst().get(),
is(instanceOf(JacksonAnnotationIntrospector.class)));
}

// Check the copied ObjectMapper works fine
Map<String, Integer> map = new HashMap<>();
map.put("one", 1);
Map<String, Integer> deserialized = copiedObjectMapper
.readValue(objectMapper.writeValueAsBytes(map), new TypeReference<Map<String, Integer>>() {});
assertThat(deserialized.size(), is(1));
assertThat(deserialized.get("one"), is(1));
}

@Test
public void copyWithDefaultConfig()
throws IOException
{
assertCopy(false);
}

@Test
public void copyWithAdvancedConfig()
throws IOException
{
assertCopy(true);
}
}
Back | FazBrowse Home | New Git URL