=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java' --- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 2012-12-06 09:06:40 +0000 +++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 2012-12-06 10:01:52 +0000 @@ -33,6 +33,9 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair; +import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; +import com.fasterxml.jackson.dataformat.xml.JacksonXmlAnnotationIntrospector; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator; import org.hisp.dhis.common.view.BasicView; @@ -85,6 +88,14 @@ jsonMapper.getFactory().enable( JsonGenerator.Feature.QUOTE_FIELD_NAMES ); xmlMapper.configure( ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true ); + jsonMapper.setAnnotationIntrospector( + new JacksonAnnotationIntrospector() ); + + xmlMapper.setAnnotationIntrospector( + new AnnotationIntrospectorPair( + new JacksonXmlAnnotationIntrospector(), + new JacksonAnnotationIntrospector() ) ); + // register view classes viewClasses.put( "default", BasicView.class ); viewClasses.put( "basic", BasicView.class );