=== added directory 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render' === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/DefaultRenderService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/DefaultRenderService.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/DefaultRenderService.java 2014-03-25 13:20:56 +0000 @@ -0,0 +1,89 @@ +package org.hisp.dhis.dxf2.render; + +/* + * Copyright (c) 2004-2014, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +/** + * Default implementation that uses Jackson to serialize/deserialize + * + * @author Morten Olav Hansen + */ +public class DefaultRenderService implements RenderService +{ + private final ObjectMapper jsonMapper = new ObjectMapper(); + + public DefaultRenderService() + { + configureObjectMapper(); + } + + private void configureObjectMapper() + { + jsonMapper.setSerializationInclusion( JsonInclude.Include.NON_NULL ); + jsonMapper.configure( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false ); + jsonMapper.configure( SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false ); + jsonMapper.configure( SerializationFeature.FAIL_ON_EMPTY_BEANS, false ); + jsonMapper.configure( SerializationFeature.WRAP_EXCEPTIONS, true ); + + jsonMapper.configure( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false ); + jsonMapper.configure( DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, true ); + jsonMapper.configure( DeserializationFeature.WRAP_EXCEPTIONS, true ); + + jsonMapper.disable( MapperFeature.AUTO_DETECT_FIELDS ); + jsonMapper.disable( MapperFeature.AUTO_DETECT_CREATORS ); + jsonMapper.disable( MapperFeature.AUTO_DETECT_GETTERS ); + jsonMapper.disable( MapperFeature.AUTO_DETECT_SETTERS ); + jsonMapper.disable( MapperFeature.AUTO_DETECT_IS_GETTERS ); + + jsonMapper.getJsonFactory().enable( JsonGenerator.Feature.QUOTE_FIELD_NAMES ); + } + + @Override + public void toJson( OutputStream output, Object value ) throws IOException + { + jsonMapper.writeValue( output, value ); + } + + @Override + @SuppressWarnings( "unchecked" ) + public T fromJson( InputStream input, Class clazz ) throws IOException + { + return (T) jsonMapper.readValue( input, clazz ); + } +} === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/RenderService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/RenderService.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/RenderService.java 2014-03-25 13:20:56 +0000 @@ -0,0 +1,45 @@ +package org.hisp.dhis.dxf2.render; + +/* + * Copyright (c) 2004-2014, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import com.fasterxml.jackson.core.JsonParseException; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +/** + * @author Morten Olav Hansen + */ +public interface RenderService +{ + void toJson( OutputStream output, Object value ) throws IOException; + + T fromJson( InputStream input, Class clazz ) throws IOException; +} === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 2014-03-25 13:20:56 +0000 @@ -47,8 +47,6 @@ import org.hisp.dhis.common.view.UuidView; import org.hisp.dhis.common.view.WithoutOrganisationUnitsView; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml 2014-03-21 09:35:30 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml 2014-03-25 13:20:56 +0000 @@ -3,6 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= "http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"> + + === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java 2014-03-25 11:40:32 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java 2014-03-25 13:20:56 +0000 @@ -38,6 +38,7 @@ import org.hisp.dhis.common.PagerUtils; import org.hisp.dhis.dxf2.filter.FilterService; import org.hisp.dhis.dxf2.metadata.ExchangeClasses; +import org.hisp.dhis.dxf2.render.RenderService; import org.hisp.dhis.dxf2.utils.JacksonUtils; import org.hisp.dhis.schema.Schema; import org.hisp.dhis.schema.SchemaService; @@ -90,6 +91,9 @@ @Autowired protected SchemaService schemaService; + @Autowired + protected RenderService renderService; + //-------------------------------------------------------------------------- // GET //-------------------------------------------------------------------------- @@ -167,7 +171,7 @@ output.put( "objects", objects ); } - JacksonUtils.toJson( response.getOutputStream(), output ); + renderService.toJson( response.getOutputStream(), output ); } else {