diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-14 18:39:23 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-14 18:39:23 +0000 |
commit | 175df4ad075e1143d404fbf000ead4de551c9b27 (patch) | |
tree | 8a8a1543de32e97de3032c15cb7d51cab84772e4 /sca-java-2.x/trunk/modules/databinding-json/src/main | |
parent | 6c2ba11d76e90972280fbb2c6328bdad8ec068e8 (diff) |
Make the jackson annotation introspector come before the JAXB one as we need to use the Jackson annotations to override the JAXB in some cases
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1244154 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/databinding-json/src/main')
-rw-r--r-- | sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java index fc9f4aed76..b8ad9629fe 100644 --- a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java +++ b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java @@ -104,8 +104,9 @@ public class JacksonHelper { mapper = new ObjectMapper(); mapper.registerModule(new JsonOrgModule()); } - AnnotationIntrospector primary = new JaxbAnnotationIntrospector(); - AnnotationIntrospector secondary = new JacksonAnnotationIntrospector(); + // Let's honor the Jackson annotations first + AnnotationIntrospector primary = new JacksonAnnotationIntrospector(); + AnnotationIntrospector secondary = new JaxbAnnotationIntrospector(); AnnotationIntrospector pair = new AnnotationIntrospector.Pair(primary, secondary); mapper.setDeserializationConfig(mapper.getDeserializationConfig().withAnnotationIntrospector(pair) .without(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES) |