Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
conor10 committed Dec 5, 2016
2 parents a4fd5b3 + 823ae88 commit 287c167
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/main/java/org/web3j/protocol/ObjectMapperFactory.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.web3j.protocol;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;

Expand All @@ -14,6 +14,7 @@ public class ObjectMapperFactory {

static {
objectMapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true);
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
}

public static ObjectMapper getObjectMapper() {
Expand Down

0 comments on commit 287c167

Please sign in to comment.